From a7431ea4e38caa726a94393982dd4c611203f4ea Mon Sep 17 00:00:00 2001 From: zhangfuzhi Date: Sat, 19 Nov 2022 15:00:08 +0800 Subject: [PATCH] =?UTF-8?q?observer=20=E6=B5=8B=E8=AF=95=E5=A5=97=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangfuzhi --- .../observer/entry/src/main/config.json | 40 -- .../entry/src/main/ets/TestAbility/app.ets | 2 +- .../entry/src/main/ets/test/List.test.ets | 10 +- .../src/main/ets/test/ObserverJsunit.test.ets | 664 ++++++++---------- .../entry/src/main/ets/test/Utils.ets | 119 ---- .../entry/src/main/ets/test/lib/Const.js | 36 - 6 files changed, 297 insertions(+), 574 deletions(-) delete mode 100644 telephony/telephonyjstest/observer/entry/src/main/ets/test/Utils.ets delete mode 100644 telephony/telephonyjstest/observer/entry/src/main/ets/test/lib/Const.js diff --git a/telephony/telephonyjstest/observer/entry/src/main/config.json b/telephony/telephonyjstest/observer/entry/src/main/config.json index 99ec1f297..7eab57da2 100644 --- a/telephony/telephonyjstest/observer/entry/src/main/config.json +++ b/telephony/telephonyjstest/observer/entry/src/main/config.json @@ -68,49 +68,9 @@ } ], "reqPermissions": [ - { - "name": "ohos.permission.LOCATION", - "reason": "need use ohos.permission.LOCATION" - }, - { - "name":"ohos.permission.SET_TELEPHONY_STATE", - "reason":"need use ohos.permission.SET_TELEPHONY_STATE" - }, - { - "name":"ohos.permission.GET_TELEPHONY_STATE", - "reason":"need use ohos.permission.GET_TELEPHONY_STATE" - }, - { - "name":"ohos.permission.PLACE_CALL", - "reason":"need use ohos.permission.PLACE_CALL" - }, - { - "name":"ohos.permission.READ_CONTACTS", - "reason":"need use ohos.permission.READ_CONTACTS" - }, - { - "name":"ohos.permission.WRITE_CONTACTS", - "reason":"need use ohos.permission.WRITE_CONTACTS" - }, - { - "name":"ohos.permission.SEND_MESSAGES", - "reason":"need use ohos.permission.SEND_MESSAGES" - }, - { - "name":"ohos.permission.RECEIVE_SMS", - "reason":"need use ohos.permission.RECEIVE_SMS" - }, - { - "name":"ohos.permission.READ_CALL_LOG", - "reason":"need use ohos.permission.READ_CALL_LOG" - }, { "name":"ohos.permission.GET_NETWORK_INFO", "reason":"need use ohos.permission.GET_NETWORK_INFO" - }, - { - "name":"ohos.permission.INTERNET", - "reason":"need use ohos.permission.INTERNET" } ], "js": [ diff --git a/telephony/telephonyjstest/observer/entry/src/main/ets/TestAbility/app.ets b/telephony/telephonyjstest/observer/entry/src/main/ets/TestAbility/app.ets index 1405dd359..870e5798a 100644 --- a/telephony/telephonyjstest/observer/entry/src/main/ets/TestAbility/app.ets +++ b/telephony/telephonyjstest/observer/entry/src/main/ets/TestAbility/app.ets @@ -13,7 +13,7 @@ * limitations under the License. */ import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' -import { Hypium } from 'hypium/index' +import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' export default { diff --git a/telephony/telephonyjstest/observer/entry/src/main/ets/test/List.test.ets b/telephony/telephonyjstest/observer/entry/src/main/ets/test/List.test.ets index a9cdf9b1d..7017cacaf 100644 --- a/telephony/telephonyjstest/observer/entry/src/main/ets/test/List.test.ets +++ b/telephony/telephonyjstest/observer/entry/src/main/ets/test/List.test.ets @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 @@ -13,12 +13,8 @@ * limitations under the License. */ -//other import - -import observer from './ObserverJsunit.test.ets' +import ObserverJsunit from './ObserverJsunit.test' export default function testsuite() { - - observer(); - + ObserverJsunit() } \ No newline at end of file diff --git a/telephony/telephonyjstest/observer/entry/src/main/ets/test/ObserverJsunit.test.ets b/telephony/telephonyjstest/observer/entry/src/main/ets/test/ObserverJsunit.test.ets index 8391cdabf..f8ddd66e3 100644 --- a/telephony/telephonyjstest/observer/entry/src/main/ets/test/ObserverJsunit.test.ets +++ b/telephony/telephonyjstest/observer/entry/src/main/ets/test/ObserverJsunit.test.ets @@ -1,6 +1,5 @@ -// @ts-nocheck /** - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-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 @@ -13,23 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -import observer from '@ohos.telephony.observer' +import { describe, expect, it } from '@ohos/hypium' import cellular from '@ohos.telephony.data' -import radio from '@ohos.telephony.radio' -import call from '@ohos.telephony.call' -import utils from './Utils.ets' -import {SimStateData} from '@ohos.telephony.observer' -import {LockReason} from '@ohos.telephony.observer' -import sim from "@ohos.telephony.sim" +import observer from '@ohos.telephony.observer'; - -export default function observerJsunit() { - describe('ObserverTest', function () { +export default function ObserverJsunit() { + describe('ObserverJsunit', function () { console.log("************* Observer Test start *************") - - const SLOT_0 = 0; - const SLOT_2 = -1; + let envReady = false; /* * @tc.number : Telephony_observer_observer_DataConnectState_0100 @@ -37,11 +27,6 @@ export default function observerJsunit() { * @tc.desc : check the getCellularDataState callback to verify the call back data */ it('Telephony_observer_observer_DataConnectState_0100', 0, function (done) { - expect(observer.NetworkState == radio.NetworkState).assertTrue(); - expect(observer.SignalInformation == radio.SignalInformation).assertTrue(); - expect(observer.CellInformation == radio.CellInformation ).assertTrue(); - expect(observer.RatType == radio.RadioTechnology).assertTrue(); - expect(observer.CallState == call.CallState).assertTrue(); console.log("************* Telephony_observer_observer_DataConnectState_0100 Test start *************") cellular.getCellularDataState((err, data) => { if (!err) { @@ -60,32 +45,6 @@ export default function observerJsunit() { console.log("************* Telephony_observer_observer_DataConnectState_0100 Test end *************") }) - /* - * @tc.number : Telephony_observer_observer_DataConnectState_0200 - * @tc.name : DataConnectState - * @tc.desc : check the getCellularDataState callback to verify the call back data - */ - it('Telephony_observer_observer_DataConnectState_0200', 0, function (done) { - console.log("************* Telephony_observer_observer_DataConnectState_0200 Test start *************") - console.log("Telephony_observer_observer_DataConnectState_0200" + observer.DataConnectState) - expect(observer.DataConnectState == undefined).assertTrue(); - console.log("************* Telephony_observer_observer_DataConnectState_0200 Test end *************") - done(); - }) - - /* - * @tc.number : Telephony_observer_observer_RatType_0100 - * @tc.name : RatType - * @tc.desc : Obtains the data connect state - */ - it('Telephony_observer_observer_RatType_0100', 0, async function (done) { - console.log("************* Telephony_observer_observer_RatType_0100 Test start *************") - console.log("Telephony_observer_observer_RatType_0100" +observer.RatType) - expect(observer.RatType == undefined).assertTrue(); - console.log("************* Telephony_observer_observer_RatType_0100 Test end *************") - done() - }) - /* * @tc.number : Telephony_observer_observer_on_networkStateChange_0100 * @tc.name : on_networkStateChange @@ -93,13 +52,17 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_networkStateChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_on_networkStateChange_0100 Test start *************") - observer.on('networkStateChange', (networkState) => { - expect().assertFail() + try { + observer.on('networkStateChange', NetworkState => { + console.log("on networkStateChange, NetworkState:" + JSON.stringify(NetworkState)); + expect(typeof NetworkState === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_networkStateChange_0100 Test end *************") - done() }) /* @@ -109,15 +72,19 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_networkStateChange_0200', 0, async function (done) { console.log("************* Telephony_observer_observer_on_networkStateChange_0200 Test start *************") - observer.on('networkStateChange', { - slotId: SLOT_0 - }, (networkState) => { - expect().assertFail() + try { + observer.on('networkStateChange', { + slotId: 0 + }, NetworkState => { + console.log("on networkStateChange, NetworkState:" + JSON.stringify(NetworkState)); + expect(typeof NetworkState === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_networkStateChange_0200 Test end *************") - done() }) /* @@ -127,13 +94,21 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_off_networkStateChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_off_networkStateChange_0100 Test start *************") - observer.off('networkStateChange', (networkState) => { - expect().assertFail() + try { + let callback = NetworkState => { + console.log("on networkStateChange, NetworkState:" + JSON.stringify(NetworkState)); + expect(typeof NetworkState === undefined).assertFalse() + } + observer.on('networkStateChange', callback); + // 可以指定传入on中的callback取消一个订阅，也可以不指定callback清空所有订阅。 + observer.off('networkStateChange', callback); + observer.off('networkStateChange'); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_off_networkStateChange_0100 Test end *************") - done() }) /* @@ -143,13 +118,17 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_signalInfoChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_on_signalInfoChange_0100 Test start *************") - observer.on('signalInfoChange', (signalInformation) => { - expect().assertFail() + try { + observer.on('signalInfoChange', SignalInformation => { + console.log("on signalInfoChange, SignalInformation:" + JSON.stringify(SignalInformation)); + expect(typeof SignalInformation === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_signalInfoChange_0100 Test end *************") - done() }) /* @@ -159,15 +138,19 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_signalInfoChange_0200', 0, async function (done) { console.log("************* Telephony_observer_observer_on_signalInfoChange_0200 Test start *************") - observer.on('signalInfoChange', { - slotId: SLOT_0 - }, (signalInformation) => { - expect().assertFail() + try { + observer.on('signalInfoChange', { + slotId: 0 + }, SignalInformation => { + console.log("on signalInfoChange, SignalInformation:" + JSON.stringify(SignalInformation)); + expect(typeof SignalInformation === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_signalInfoChange_0200 Test end *************") - done() }) /* @@ -177,16 +160,23 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_off_signalInfoChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_off_signalInfoChange_0100 Test start *************") - observer.off('signalInfoChange', (networkState) => { - expect().assertFail() + try { + let callback = SignalInformation => { + console.log("on signalInfoChange, SignalInformation:" + JSON.stringify(SignalInformation)); + expect(typeof SignalInformation === undefined).assertFalse() + } + observer.on('signalInfoChange', callback); + // 可以指定传入on中的callback取消一个订阅，也可以不指定callback清空所有订阅。 + observer.off('signalInfoChange', callback); + observer.off('signalInfoChange'); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_off_signalInfoChange_0100 Test end *************") - done() }) - /* * @tc.number : Telephony_observer_observer_on_cellularDataConnectionStateChange_0100 @@ -195,13 +185,18 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_cellularDataConnectionStateChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_on_cellularDataConnectionStateChange_0100 Test start *************") - observer.on('cellularDataConnectionStateChange', (data) => { - expect().assertFail() + try { + observer.on('cellularDataConnectionStateChange', value => { + console.log("on cellularDataConnectionStateChange, state:" + value.state + ", network:" + value.network); + expect(typeof value.state === undefined).assertFalse() + expect(typeof value.network === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_cellularDataConnectionStateChange_0100 Test end *************") - done() }) /* @@ -211,15 +206,20 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_cellularDataConnectionStateChange_0200', 0, async function (done) { console.log("************* Telephony_observer_observer_on_cellularDataConnectionStateChange_0200 Test start *************") - observer.on('cellularDataConnectionStateChange', { - slotId: SLOT_0 - }, (data) => { - expect().assertFail() + try { + observer.on('cellularDataConnectionStateChange', { + slotId: 0 + }, value => { + console.log("on cellularDataConnectionStateChange, state:" + value.state + ", network:" + value.network); + expect(typeof value.state === undefined).assertFalse() + expect(typeof value.network === undefined).assertFalse() + }); + done() + } catch (error) { + expect(false).assertTrue() done() - return - }) + } console.log("************* Telephony_observer_observer_on_cellularDataConnectionStateChange_0200 Test end *************") - done() }) /* @@ -229,13 +229,20 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_off_cellularDataConnectionStateChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_off_cellularDataConnectionStateChange_0100 Test start *************") - observer.off('cellularDataConnectionStateChange', (data) => { - expect().assertFail() + try { + let callback = value => { + console.log("on cellularDataConnectionStateChange, state:" + value.state + ", network:" + value.network); + } + observer.on('cellularDataConnectionStateChange', callback); + // 可以指定传入on中的callback取消一个订阅，也可以不指定callback清空所有订阅。 + observer.off('cellularDataConnectionStateChange', callback); + observer.off('cellularDataConnectionStateChange'); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_off_cellularDataConnectionStateChange_0100 Test end *************") - done() }) /* @@ -245,13 +252,17 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_cellularDataFlowChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_on_cellularDataFlowChange_0100 Test start *************") - observer.on('cellularDataFlowChange', (data) => { - expect().assertFail() + try { + observer.on('cellularDataFlowChange', DataFlowType => { + console.log("on networkStateChange, DataFlowType:" + JSON.stringify(DataFlowType)); + expect(typeof DataFlowType === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_cellularDataFlowChange_0100 Test end *************") - done() }) /* @@ -261,15 +272,19 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_cellularDataFlowChange_0200', 0, async function (done) { console.log("************* Telephony_observer_observer_on_cellularDataFlowChange_0200 Test start *************") - observer.on('cellularDataFlowChange', { - slotId: SLOT_0 - }, (data) => { - expect().assertFail() + try { + observer.on('cellularDataFlowChange', { + slotId: 0 + }, DataFlowType => { + console.log("on networkStateChange, DataFlowType:" + JSON.stringify(DataFlowType)); + expect(typeof DataFlowType === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_cellularDataFlowChange_0200 Test end *************") - done() }) /* @@ -279,13 +294,20 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_off_cellularDataFlowChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_off_cellularDataFlowChange_0100 Test start *************") - observer.off('cellularDataFlowChange', (data) => { - expect().assertFail() + try { + let callback = data => { + console.log("on cellularDataFlowChange, data:" + JSON.stringify(data)); + } + observer.on('cellularDataFlowChange', callback); + // 可以指定传入on中的callback取消一个订阅，也可以不指定callback清空所有订阅。 + observer.off('cellularDataFlowChange', callback); + observer.off('cellularDataFlowChange'); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_off_cellularDataFlowChange_0100 Test end *************") - done() }) /* @@ -295,13 +317,17 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_callStateChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_on_callStateChange_0100 Test start *************") - observer.on('callStateChange', (data) => { - expect().assertFail() + try { + observer.on('callStateChange', value => { + console.log("on callStateChange, state:" + value.state + ", number:" + value.number); + expect(typeof value.state === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_callStateChange_0100 Test end *************") - done() }) /* @@ -311,15 +337,19 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_callStateChange_0200', 0, async function (done) { console.log("************* Telephony_observer_observer_on_callStateChange_0200 Test start *************") - observer.on('callStateChange', { - slotId: SLOT_0 - }, (data) => { - expect().assertFail() + try { + observer.on('callStateChange', { + slotId: 0 + }, value => { + console.log("on callStateChange, state:" + value.state + ", number:" + value.number); + expect(typeof value.state === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_callStateChange_0200 Test end *************") - done() }) /* @@ -329,13 +359,20 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_off_callStateChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_off_callStateChange_0100 Test start *************") - observer.off('callStateChange', (data) => { - expect().assertFail() + try { + let callback = value => { + console.log("on callStateChange, state:" + value.state + ", number:" + value.number); + } + observer.on('callStateChange', callback); + // 可以指定传入on中的callback取消一个订阅，也可以不指定callback清空所有订阅。 + observer.off('callStateChange', callback); + observer.off('callStateChange'); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_off_callStateChange_0100 Test end *************") - done() }) /* @@ -345,13 +382,17 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_simStateChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_on_simStateChange_0100 Test start *************") - observer.on('simStateChange', (data) => { - expect().assertFail() + try { + observer.on('simStateChange', SimStateData => { + console.log("on simStateChange, SimStateData:" + JSON.stringify(SimStateData)); + expect(typeof SimStateData === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_simStateChange_0100 Test end *************") - done() }) /* @@ -361,15 +402,19 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_on_simStateChange_0200', 0, async function (done) { console.log("************* Telephony_observer_observer_on_simStateChange_0200 Test start *************") - observer.on('simStateChange', { - slotId: SLOT_0 - }, (data) => { - expect().assertFail() + try { + observer.on('simStateChange', { + slotId: 0 + }, SimStateData => { + console.log("on simStateChange, SimStateData:" + JSON.stringify(SimStateData)); + expect(typeof SimStateData === undefined).assertFalse() + }); done() - return - }) + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_observer_observer_on_simStateChange_0200 Test end *************") - done() }) /* @@ -379,150 +424,20 @@ export default function observerJsunit() { */ it('Telephony_observer_observer_off_simStateChange_0100', 0, async function (done) { console.log("************* Telephony_observer_observer_off_simStateChange_0100 Test start *************") - observer.off('simStateChange', (data) => { - expect().assertFail() + try { + let callback = data => { + console.log("on simStateChange, data:" + JSON.stringify(data)); + } + observer.on('simStateChange', callback); + // 可以指定传入on中的callback取消一个订阅，也可以不指定callback清空所有订阅。 + observer.off('simStateChange', callback); + observer.off('simStateChange'); + done() + } catch (error) { + expect(false).assertTrue() done() - return - }) - console.log("************* Telephony_observer_observer_off_simStateChange_0100 Test end *************") - done() - }) - - /* - * @tc.number : Telephony_observer_SimStateData_type_0100 - * @tc.name : type - * @tc.desc : check the type value of SimStateData object - */ - it('Telephony_observer_SimStateData_type_0100', 0, function (done) { - console.log("************* Telephony_observer_SimStateData_type_0100 Test start *************") - const unknown: SimStateData = { - type: sim.CardType.UNKNOWN_CARD - } - expect(-1).assertEqual(unknown.type) - - const singleMode: SimStateData = { - type: sim.CardType.SINGLE_MODE_SIM_CARD - } - expect(10).assertEqual(singleMode.type) - - const singleModeUSim: SimStateData = { - type: sim.CardType.SINGLE_MODE_USIM_CARD - } - expect(20).assertEqual(singleModeUSim.type) - done() - console.log("************* Telephony_observer_SimStateData_type_0100 Test end *************") - }) - - /* - * @tc.number : Telephony_observer_SimStateData_type_0200 - * @tc.name : type - * @tc.desc : check the type value of SimStateData object - */ - it('Telephony_observer_SimStateData_type_0200', 0, function (done) { - console.log("************* Telephony_observer_SimStateData_type_0200 Test start *************") - const singleModeRUim: SimStateData = { - type: sim.CardType.SINGLE_MODE_RUIM_CARD - } - expect(30).assertEqual(singleModeRUim.type) - - const dualModeCG: SimStateData = { - type: sim.CardType.DUAL_MODE_CG_CARD - } - expect(40).assertEqual(dualModeCG.type) - - const ctNationalRoaming: SimStateData = { - type: sim.CardType.CT_NATIONAL_ROAMING_CARD - } - expect(41).assertEqual(ctNationalRoaming.type) - done() - console.log("************* Telephony_observer_SimStateData_type_0200 Test end *************") - }) - - /* - * @tc.number : Telephony_observer_SimStateData_type_0300 - * @tc.name : type - * @tc.desc : check the type value of SimStateData object - */ - it('Telephony_observer_SimStateData_type_0300', 0, function (done) { - console.log("************* Telephony_observer_SimStateData_type_0300 Test start *************") - const cuDualMode: SimStateData = { - type: sim.CardType.CU_DUAL_MODE_CARD - } - expect(42).assertEqual(cuDualMode.type) - - const dualModeTelecomLte: SimStateData = { - type: sim.CardType.DUAL_MODE_TELECOM_LTE_CARD - } - expect(43).assertEqual(dualModeTelecomLte.type) - - const dualModeUg: SimStateData = { - type: sim.CardType.DUAL_MODE_UG_CARD - } - expect(50).assertEqual(dualModeUg.type) - - const singleModeIsim: SimStateData = { - type: sim.CardType.SINGLE_MODE_ISIM_CARD - } - expect(60).assertEqual(singleModeIsim.type) - done() - console.log("************* Telephony_observer_SimStateData_type_0300 Test end *************") - }) - - /* - * @tc.number : Telephony_observer_SimStateData_state_0100 - * @tc.name : state - * @tc.desc : check the state value of SimStateData object - */ - it('Telephony_observer_SimStateData_state_0100', 0, function (done) { - console.log("************* Telephony_observer_SimStateData_state_0100 Test start *************") - const unknown: SimStateData = { - state: sim.SimState.SIM_STATE_UNKNOWN - } - expect(0).assertEqual(unknown.state) - const notPresent: SimStateData = { - state: sim.SimState.SIM_STATE_NOT_PRESENT - } - expect(1).assertEqual(notPresent.state) - done() - console.log("************* Telephony_observer_SimStateData_state_0100 Test end *************") - }) - - /* - * @tc.number : Telephony_observer_SimStateData_state_0200 - * @tc.name : state - * @tc.desc : check the state value of SimStateData object - */ - it('Telephony_observer_SimStateData_state_0200', 0, function (done) { - console.log("************* Telephony_observer_SimStateData_state_0200 Test start *************") - const locked: SimStateData = { - state: sim.SimState.SIM_STATE_LOCKED - } - expect(2).assertEqual(locked.state) - const notReady: SimStateData = { - state: sim.SimState.SIM_STATE_NOT_READY - } - expect(3).assertEqual(notReady.state) - done() - console.log("************* Telephony_observer_SimStateData_state_0200 Test end *************") - }) - - /* - * @tc.number : Telephony_observer_SimStateData_state_0300 - * @tc.name : state - * @tc.desc : check the state value of SimStateData object - */ - it('Telephony_observer_SimStateData_state_0300', 0, function (done) { - console.log("************* Telephony_observer_SimStateData_state_0300 Test start *************") - const ready: SimStateData = { - state: sim.SimState.SIM_STATE_READY - } - expect(4).assertEqual(ready.state) - const loaded: SimStateData = { - state: sim.SimState.SIM_STATE_LOADED } - expect(5).assertEqual(loaded.state) - done() - console.log("************* Telephony_observer_SimStateData_state_0300 Test end *************") + console.log("************* Telephony_observer_observer_off_simStateChange_0100 Test end *************") }) /* @@ -531,12 +446,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_NONE property of LockReason */ it('Telephony_observer_LockReason_SIM_NONE_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_NONE_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(0).assertEqual(LockReason.SIM_NONE) + console.log("************* Telephony_observer_LockReason_SIM_NONE_0100 Test start *************") + expect(0).assertEqual(observer.LockReason.SIM_NONE) done() console.log("************* Telephony_observer_LockReason_SIM_NONE_0100 Test end *************") }) @@ -547,12 +463,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_PIN property of LockReason */ it('Telephony_observer_LockReason_SIM_PIN_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_PIN_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(1).assertEqual(LockReason.SIM_PIN) + console.log("************* Telephony_observer_LockReason_SIM_PIN_0100 Test start *************") + expect(1).assertEqual(observer.LockReason.SIM_PIN) done() console.log("************* Telephony_observer_LockReason_SIM_PIN_0100 Test end *************") }) @@ -563,12 +480,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_PUK property of LockReason */ it('Telephony_observer_LockReason_SIM_PUK_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_PUK_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(2).assertEqual(LockReason.SIM_PUK) + console.log("************* Telephony_observer_LockReason_SIM_PUK_0100 Test start *************") + expect(2).assertEqual(observer.LockReason.SIM_PUK) done() console.log("************* Telephony_observer_LockReason_SIM_PUK_0100 Test end *************") }) @@ -579,12 +497,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_PN_PIN property of LockReason */ it('Telephony_observer_LockReason_SIM_PN_PIN_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_PN_PIN_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(3).assertEqual(LockReason.SIM_PN_PIN) + console.log("************* Telephony_observer_LockReason_SIM_PN_PIN_0100 Test start *************") + expect(3).assertEqual(observer.LockReason.SIM_PN_PIN) done() console.log("************* Telephony_observer_LockReason_SIM_PN_PIN_0100 Test end *************") }) @@ -594,12 +513,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_PN_PUK property of LockReason */ it('Telephony_observer_LockReason_SIM_PN_PUK_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_PN_PUK_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(4).assertEqual(LockReason.SIM_PN_PUK) + console.log("************* Telephony_observer_LockReason_SIM_PN_PUK_0100 Test start *************") + expect(4).assertEqual(observer.LockReason.SIM_PN_PUK) done() console.log("************* Telephony_observer_LockReason_SIM_PN_PUK_0100 Test end *************") }) @@ -610,12 +530,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_PU_PIN property of LockReason */ it('Telephony_observer_LockReason_SIM_PU_PIN_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_PU_PIN_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(5).assertEqual(LockReason.SIM_PU_PIN) + console.log("************* Telephony_observer_LockReason_SIM_PU_PIN_0100 Test start *************") + expect(5).assertEqual(observer.LockReason.SIM_PU_PIN) done() console.log("************* Telephony_observer_LockReason_SIM_PU_PIN_0100 Test end *************") }) @@ -626,12 +547,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_PU_PUK property of LockReason */ it('Telephony_observer_LockReason_SIM_PU_PUK_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_PU_PUK_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(6).assertEqual(LockReason.SIM_PU_PUK) + console.log("************* Telephony_observer_LockReason_SIM_PU_PUK_0100 Test start *************") + expect(6).assertEqual(observer.LockReason.SIM_PU_PUK) done() console.log("************* Telephony_observer_LockReason_SIM_PU_PUK_0100 Test end *************") }) @@ -642,12 +564,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_PP_PIN property of LockReason */ it('Telephony_observer_LockReason_SIM_PP_PIN_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_PP_PIN_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(7).assertEqual(LockReason.SIM_PP_PIN) + console.log("************* Telephony_observer_LockReason_SIM_PP_PIN_0100 Test start *************") + expect(7).assertEqual(observer.LockReason.SIM_PP_PIN) done() console.log("************* Telephony_observer_LockReason_SIM_PP_PIN_0100 Test end *************") }) @@ -658,12 +581,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_PP_PUK property of LockReason */ it('Telephony_observer_LockReason_SIM_PP_PUK_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_PP_PUK_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(8).assertEqual(LockReason.SIM_PP_PUK) + console.log("************* Telephony_observer_LockReason_SIM_PP_PUK_0100 Test start *************") + expect(8).assertEqual(observer.LockReason.SIM_PP_PUK) done() console.log("************* Telephony_observer_LockReason_SIM_PP_PUK_0100 Test end *************") }) @@ -674,12 +598,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_PC_PIN property of LockReason */ it('Telephony_observer_LockReason_SIM_PC_PIN_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_PC_PIN_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(9).assertEqual(LockReason.SIM_PC_PIN) + console.log("************* Telephony_observer_LockReason_SIM_PC_PIN_0100 Test start *************") + expect(9).assertEqual(observer.LockReason.SIM_PC_PIN) done() console.log("************* Telephony_observer_LockReason_SIM_PC_PIN_0100 Test end *************") }) @@ -690,12 +615,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_PC_PUK property of LockReason */ it('Telephony_observer_LockReason_SIM_PC_PUK_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_PC_PUK_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(10).assertEqual(LockReason.SIM_PC_PUK) + console.log("************* Telephony_observer_LockReason_SIM_PC_PUK_0100 Test start *************") + expect(10).assertEqual(observer.LockReason.SIM_PC_PUK) done() console.log("************* Telephony_observer_LockReason_SIM_PC_PUK_0100 Test end *************") }) @@ -706,12 +632,13 @@ export default function observerJsunit() { * @tc.desc : check the SIM_SIM_PIN property of LockReason */ it('Telephony_observer_LockReason_SIM_SIM_PIN_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_SIM_PIN_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(11).assertEqual(LockReason.SIM_SIM_PIN) + console.log("************* Telephony_observer_LockReason_SIM_SIM_PIN_0100 Test start *************") + expect(11).assertEqual(observer.LockReason.SIM_SIM_PIN) done() console.log("************* Telephony_observer_LockReason_SIM_SIM_PIN_0100 Test end *************") }) @@ -722,22 +649,17 @@ export default function observerJsunit() { * @tc.desc : check the SIM_SIM_PUK property of LockReason */ it('Telephony_observer_LockReason_SIM_SIM_PUK_0100', 0, function (done) { - console.log("************* Telephony_observer_LockReason_SIM_SIM_PUK_0100 Test start *************") - if (utils.notCheck) { - expect(true).assertTrue() - done() + if (!envReady) { + console.info("The environment was not ready"); + done(); + return; } - expect(12).assertEqual(LockReason.SIM_SIM_PUK) + console.log("************* Telephony_observer_LockReason_SIM_SIM_PUK_0100 Test start *************") + expect(12).assertEqual(observer.LockReason.SIM_SIM_PUK) done() console.log("************* Telephony_observer_LockReason_SIM_SIM_PUK_0100 Test end *************") }) - function timeout(done) { - expect(true).assertTrue() - console.debug('Observer Test=========timeout========'); - done() - } - /* * @tc.number : Telephony_Observer_SimStateData_Reason * @tc.name : on_simStateChange @@ -745,21 +667,21 @@ export default function observerJsunit() { */ it('Telephony_Observer_SimStateData_Reason', 0, async function (done) { console.log("************* Telephony_Observer_SimStateData_Reason Test start *************") - observer.on('simStateChange', (data:SimStateData) => { - if((data === null || data === undefined) - || (data.reason == null || data.reason === undefined)){ - expect(true).assertTrue() - done() - } - return - }) + try { + observer.on('simStateChange', SimStateData => { + console.log("on simStateChange, SimStateData:" + JSON.stringify(SimStateData)); + expect(typeof SimStateData.reason === undefined).assertFalse() + expect(typeof SimStateData.state === undefined).assertFalse() + expect(typeof SimStateData.type === undefined).assertFalse() + }); + done() + } catch (error) { + expect(false).assertTrue() + done() + } console.log("************* Telephony_Observer_SimStateData_Reason Test end *************") - done() }) console.log("************* Observer Test end *************") }) -} - - - +} \ No newline at end of file diff --git a/telephony/telephonyjstest/observer/entry/src/main/ets/test/Utils.ets b/telephony/telephonyjstest/observer/entry/src/main/ets/test/Utils.ets deleted file mode 100644 index 65f70088d..000000000 --- a/telephony/telephonyjstest/observer/entry/src/main/ets/test/Utils.ets +++ /dev/null @@ -1,119 +0,0 @@ -// @ts-nocheck -/** - * 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. - */ - -export default class Utils { - static rect_left; - static rect_top; - static rect_right; - static rect_bottom; - static rect_value; - static notCheck = true; - - static sleep(time) { - return new Promise((resolve, reject) => { - setTimeout(() => { - resolve() - }, time) - }).then(() => { - console.info(`sleep ${time} over...`) - }) - } - - static getComponentRect(key) { - let strJson = getInspectorByKey(key); - let obj = JSON.parse(strJson); - console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); - let rectInfo = JSON.parse('[' + obj.$rect + ']') - console.info("[getInspectorByKey] rectInfo is: " + rectInfo); - this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0] - this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1] - this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0] - this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1] - return this.rect_value = { - "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom - } - } - - static async swipe(downX, downY, upX, upY, steps) { - console.info('start to swipe') - this.drags(downX, downY, upX, upY, steps, false) - } - - static async drag(downX, downY, upX, upY, steps) { - console.info('start to drag') - this.drags(downX, downY, upX, upY, steps, true) - } - - static async drags(downX, downY, upX, upY, steps, drag) { - var xStep; - var yStep; - var swipeSteps; - var ret; - xStep = 0; - yStep = 0; - ret = false; - swipeSteps = steps; - if (swipeSteps == 0) { - swipeSteps = 1; - } - xStep = (upX - downX) / swipeSteps; - yStep = (upY - downY) / swipeSteps; - console.info('move step is: ' + 'xStep: ' + xStep + ' yStep: ' + yStep) - var downPonit: TouchObject = { - id: 1, - x: downX, - y: downY, - type: TouchType.Down, - } - console.info('down touch started: ' + JSON.stringify(downPonit)) - sendTouchEvent(downPonit); - console.info('start to move') - if (drag) { - await this.sleep(500) - } - for (var i = 1;i <= swipeSteps; i++) { - var movePoint: TouchObject = { - id: 1, - x: downX + (xStep * i), - y: downY + (yStep * i), - type: TouchType.Move - } - console.info('move touch started: ' + JSON.stringify(movePoint)) - ret = sendTouchEvent(movePoint) - if (ret == false) { - break; - } - await this.sleep(5) - } - console.info('start to up') - if (drag) { - await this.sleep(100) - } - var upPoint: TouchObject = { - id: 1, - x: upX, - y: upY, - type: TouchType.Up, - } - console.info('up touch started: ' + JSON.stringify(upPoint)) - sendTouchEvent(upPoint) - await this.sleep(500) - } -} - - - - diff --git a/telephony/telephonyjstest/observer/entry/src/main/ets/test/lib/Const.js b/telephony/telephonyjstest/observer/entry/src/main/ets/test/lib/Const.js deleted file mode 100644 index f9263cd46..000000000 --- a/telephony/telephonyjstest/observer/entry/src/main/ets/test/lib/Const.js +++ /dev/null @@ -1,36 +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. - */ - -// sim slot id -export const DEFAULT_SLOTID = 0; -export const SLOTID3 = 3; -export const SLOTID2 = 2; -export const SLOTID_MINUS1 = -1; - -// sim correct password -export const CORRECT_PIN = '1234'; -export const CORRECT_PIN2 = '18099014'; - -// sim incorrect password -export const INCORRECT_PIN = '134679'; -export const INCORRECT_PIN_LEN3 = '123'; -export const INCORRECT_PUK = '134679'; -export const INCORRECT_PIN2 = '134679'; -export const INCORRECT_PIN2_LEN3 = '123'; -export const INCORRECT_PIN2_LEN9 = '123456789'; -export const INCORRECT_PUK2 = '134679'; - -// lock status response -export const LOCK_RESULT = { SUCCESS: 0, FAILURE: -1, EXCEPTION: -2 }; \ No newline at end of file -- GitLab