From 6e1a0c442369123d662723f9fca2f593b714b2de Mon Sep 17 00:00:00 2001 From: zhangyushuai Date: Mon, 24 Apr 2023 01:17:08 +0000 Subject: [PATCH] optimized screenlock test 002 Signed-off-by: zhangyushuai --- theme/screenlock_ets/Test.json | 9 + .../main/ets/test/screenLockPromiseTest.ets | 51 +++--- .../src/main/ets/test/screenLockTest.ets | 5 - .../ets/test/systemTimeCommonEvent.test.ets | 162 ------------------ 4 files changed, 31 insertions(+), 196 deletions(-) delete mode 100644 time/timeTest/entry/src/main/ets/test/systemTimeCommonEvent.test.ets diff --git a/theme/screenlock_ets/Test.json b/theme/screenlock_ets/Test.json index 406968a98..3a9dfbbc5 100644 --- a/theme/screenlock_ets/Test.json +++ b/theme/screenlock_ets/Test.json @@ -8,6 +8,15 @@ "shell-timeout": "600000" }, "kits": [ + { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602", + "uinput -T -m 300 720 300 360 200", + "uinput -T -m 650 2760 650 1380 200" + ] + }, { "test-file-name": [ "ActsScreenLockETSApiTest.hap" diff --git a/theme/screenlock_ets/entry/src/main/ets/test/screenLockPromiseTest.ets b/theme/screenlock_ets/entry/src/main/ets/test/screenLockPromiseTest.ets index 9aea96230..26ebc16af 100644 --- a/theme/screenlock_ets/entry/src/main/ets/test/screenLockPromiseTest.ets +++ b/theme/screenlock_ets/entry/src/main/ets/test/screenLockPromiseTest.ets @@ -39,12 +39,11 @@ export default function ScreenLockPromiseTest(){ it("SUB_MISC_THEME_screenLock_API_Promise_001", 0, async function (done) { console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_001-------------------"); try { - screenLock.isScreenLocked().then((data) => { - console.info("SUB_MISC_THEME_screenLock_API_Promise_001 isScreenLocked result is " + data); - expect(data == result).assertTrue() - console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_001-------------------"); + let data = await screenLock.isScreenLocked(); + console.info("SUB_MISC_THEME_screenLock_API_Promise_001 isScreenLocked result is " + data); + expect(data == result).assertTrue() + console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_001-------------------"); done(); - }) } catch (error) { console.info("SUB_MISC_THEME_screenLock_API_Promise_001 test_setScreenLocked : error = " + error); expect().assertFail(); @@ -64,12 +63,11 @@ export default function ScreenLockPromiseTest(){ it("SUB_MISC_THEME_screenLock_API_Promise_002", 0, async function (done) { console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_002-------------------"); try { - screenLock.isScreenLocked().then((data) => { - console.info("SUB_MISC_THEME_screenLock_API_Promise_002 isScreenLocked result is " + data); - expect(data == result).assertTrue(); - console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_002-------------------"); + let data = await screenLock.isScreenLocked(); + console.info("SUB_MISC_THEME_screenLock_API_Promise_002 isScreenLocked result is " + data); + expect(data == result).assertTrue() + console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_002-------------------"); done(); - }); } catch (error) { console.info("SUB_MISC_THEME_screenLock_API_Promise_002 test_setScreenLocked : error = " + error); expect().assertFail(); @@ -89,12 +87,11 @@ export default function ScreenLockPromiseTest(){ it("SUB_MISC_THEME_screenLock_API_Promise_003", 0, async function (done) { console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_003-------------------"); try { - screenLock.isSecureMode().then((data) => { - console.info("SUB_MISC_THEME_screenLock_API_Promise_003 isScreenLocked result is " + data); - expect(data == false).assertTrue(); - console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_003-------------------"); - done(); - }); + let data = await screenLock.isSecureMode(); + console.info("SUB_MISC_THEME_screenLock_API_Promise_003 isScreenLocked result is " + data); + expect(data == false).assertTrue() + console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_003-------------------"); + done(); } catch (error) { console.info("SUB_MISC_THEME_screenLock_API_Promise_003 isScreenLocked TRUE: error = " + error); expect().assertFail(); @@ -113,19 +110,15 @@ export default function ScreenLockPromiseTest(){ it("SUB_MISC_THEME_screenLock_API_Promise_004", 0, async function (done) { console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_004-------------------"); try { - screenLock.unlockScreen().then((data) => { - console.info("====>SUB_MISC_THEME_screenLock_API_Promise_004 success."); - console.info('====>-------------SUB_MISC_THEME_screenLock_API_Promise_004 end----------------------'); - expect(true).assertTrue() - done(); - }).catch( err => { - console.info("====>SUB_MISC_THEME_screenLock_API_Promise_004 failed because: " + JSON.stringify(err)); - expect().assertFail(); - done(); - }); - } catch (error) { - console.info("====>SUB_MISC_THEME_screenLock_API_Promise_004: error = " + error); - expect().assertFail(); + let data = await screenLock.unlockScreen(); + console.info("====>SUB_MISC_THEME_screenLock_API_Promise_004 success."); + expect(true).assertTrue() + console.info('====>-------------SUB_MISC_THEME_screenLock_API_Promise_004 end----------------------'); + done(); + } catch (error) { + console.info("====>SUB_MISC_THEME_screenLock_API_Promise_004: error = " + error); + expect().assertFail(); + done(); } console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_004-------------------"); }); diff --git a/theme/screenlock_ets/entry/src/main/ets/test/screenLockTest.ets b/theme/screenlock_ets/entry/src/main/ets/test/screenLockTest.ets index 039f89a51..bc690586a 100644 --- a/theme/screenlock_ets/entry/src/main/ets/test/screenLockTest.ets +++ b/theme/screenlock_ets/entry/src/main/ets/test/screenLockTest.ets @@ -54,7 +54,6 @@ export default function screenLockJSUnit() { }catch(err){ console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0001 throw_err = " + err); - expect().assertFail(); done(); } }); @@ -84,7 +83,6 @@ export default function screenLockJSUnit() { done(); }catch(err){ console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0002 throw_err = " + err); - expect().assertFail(); done(); } }); @@ -114,7 +112,6 @@ export default function screenLockJSUnit() { done(); }catch(err){ console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0003 throw_err = " + err); - expect().assertFail(); done(); } }); @@ -150,7 +147,6 @@ export default function screenLockJSUnit() { done(); }catch(err){ console.info('====>SUB_MISC_THEME_screenLock_API_0004 throw_err : ' + JSON.stringify(err)); - expect().assertFail(); done(); } }); @@ -180,7 +176,6 @@ export default function screenLockJSUnit() { done(); }catch(err){ console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0007 throw_err = " + err); - expect().assertFail(); done(); } }); diff --git a/time/timeTest/entry/src/main/ets/test/systemTimeCommonEvent.test.ets b/time/timeTest/entry/src/main/ets/test/systemTimeCommonEvent.test.ets deleted file mode 100644 index aa7839230..000000000 --- a/time/timeTest/entry/src/main/ets/test/systemTimeCommonEvent.test.ets +++ /dev/null @@ -1,162 +0,0 @@ -/* - * 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 systemTime from "@ohos.systemTime"; -import commonEvent from '@ohos.commonEvent' - -export default function systemTimeCommonEventTest() { - describe('systemTimeCommonEventTest', function () { - console.info('====>---------------systemTimeCommonEventTest start-----------------------'); - - /** - * @tc.number SUB_systemTime_commonEnevt_timeChanged_0010 - * @tc.name - * @tc.desc - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 3 - */ - it('SUB_systemTime_commonEvent_timeChanged_0010', 0, async function (done) { - function unSubscriberCallback (err){ - console.debug("====>SUB_systemTime_commonEvent_timeChanged_0010 unSubscriberCallback start"); - if (err){ - console.debug("====>SUB_systemTime_commonEvent_timeChanged_0010 unSubscriberCallback failed:" + - JSON.stringify(err)); - } else { - console.debug("====>SUB_systemTime_commonEvent_timeChanged_0010 unSubscriberCallback finish") - } - } - - function subscriberCallback (err, data){ - console.debug("====>SUB_systemTime_commonEvent_timeChanged_0010 subscriberCallback data:" - + JSON.stringify(data)); - commonEvent.unsubscribe(subscriber, unSubscriberCallback); - expect(data.event).assertEqual('usual.event.TIME_CHANGED'); - console.debug("====>SUB_systemTime_commonEvent_timeChanged_0010 end") - done(); - } - - var commonEventSubscribeInfo = { - events: ['usual.event.TIME_CHANGED'] - } - var subscriber; - commonEvent.createSubscriber(commonEventSubscribeInfo).then((data)=>{ - subscriber = data; - console.debug("====>SUB_systemTime_commonEvent_timeChanged_0010 subscriber data:" + JSON.stringify(data)) - commonEvent.subscribe(subscriber, subscriberCallback); - console.debug("====>SUB_systemTime_commonEvent_timeChanged_0010 subscriber finish") - let t = setTimeout(async ()=>{ - let currentTime= new Date().getTime() + 1500 - await systemTime.setTime(currentTime) - clearTimeout(t) - }, 500) - }) - }); - - /** - * @tc.number SUB_systemTime_commonEvent_timeTick_0010 - * @tc.name - * @tc.desc - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 3 - */ - it('SUB_systemTime_commonEvent_timeTick_0010', 0, async function (done) { - function unSubscriberCallback (err){ - console.debug("====>SUB_systemTime_commonEvent_timeTick_0010 unSubscriberCallback start"); - if (err){ - console.debug("====>SUB_systemTime_commonEvent_timeTick_0010 unSubscriberCallback failed:" + - JSON.stringify(err)); - } else { - console.debug("====>SUB_systemTime_commonEvent_timeTick_0010 unSubscriberCallback finish") - } - } - - function subscriberCallback (err, data){ - console.debug("====>SUB_systemTime_commonEvent_timeTick_0010 subscriberCallback data:" - + JSON.stringify(data)); - commonEvent.unsubscribe(subscriber, unSubscriberCallback); - expect(data.event).assertEqual('usual.event.TIME_TICK'); - console.debug("====>SUB_systemTime_commonEnevt_timeTick_0010 end") - done(); - } - - var commonEventSubscribeInfo = { - events: ['usual.event.TIME_TICK'] - } - var subscriber; - commonEvent.createSubscriber(commonEventSubscribeInfo).then((data)=>{ - subscriber = data; - console.debug("====>SUB_systemTime_commonEvent_timeTick_0010 subscriber data:" + JSON.stringify(data)) - commonEvent.subscribe(subscriber, subscriberCallback); - console.debug("====>SUB_systemTime_commonEvent_timeTick_0010 subscriber finish") - let t = setTimeout(async ()=>{ - let currentTime= new Date().getTime() - currentTime = currentTime + (58000- (currentTime % 60000)) - await systemTime.setTime(currentTime) - clearTimeout(t) - }, 500) - }) - }); - - - /** - * @tc.number SUB_systemTime_commonEvent_timezoneChanged_0010 - * @tc.name - * @tc.desc - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 3 - */ - it('SUB_systemTime_commonEvent_timezoneChanged_0010', 0, async function (done) { - function unSubscriberCallback (err){ - console.debug("====>SUB_systemTime_commonEvent_timezoneChanged_0010 unSubscriberCallback start"); - if (err){ - console.debug("====>SUB_systemTime_commonEvent_timezoneChanged_0010 unSubscriberCallback failed:" + - JSON.stringify(err)); - } else { - console.debug("====>SUB_systemTime_commonEvent_timezoneChanged_0010 unSubscriberCallback finish") - } - } - - function subscriberCallback (err, data){ - console.debug("====>SUB_systemTime_commonEvent_timezoneChanged_0010 subscriberCallback data:" - + JSON.stringify(data)); - commonEvent.unsubscribe(subscriber, unSubscriberCallback); - expect(data.event).assertEqual('usual.event.TIMEZONE_CHANGED'); - console.debug("====>SUB_systemTime_commonEvent_timezoneChanged_0010 end") - done(); - } - - var commonEventSubscribeInfo = { - events: ['usual.event.TIMEZONE_CHANGED'] - } - var subscriber; - commonEvent.createSubscriber(commonEventSubscribeInfo).then((data)=>{ - subscriber = data; - console.debug("====>SUB_systemTime_commonEvent_timezoneChanged_0010 subscriber data:" + JSON.stringify(data)) - commonEvent.subscribe(subscriber, subscriberCallback); - console.debug("====>SUB_systemTime_commonEvent_timezoneChanged_0010 subscriber finish") - let t = setTimeout(async ()=>{ - await systemTime.setTimezone('Europe/Moscow') - clearTimeout(t) - }, 500) - }) - }); - - - }); -}; -- GitLab