From 047134e8a07cca8b7601353abd2e777b583270c5 Mon Sep 17 00:00:00 2001 From: zhangyushuai Date: Fri, 7 Apr 2023 08:48:57 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=81=E5=B1=8F=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=20001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangyushuai --- theme/screenlock_ets/Test.json | 9 ++++ .../main/ets/test/screenLockPromiseTest.ets | 51 ++++++++----------- .../src/main/ets/test/screenLockTest.ets | 6 +-- 3 files changed, 32 insertions(+), 34 deletions(-) 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 899625b81..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(); } }); @@ -189,6 +184,7 @@ export default function screenLockJSUnit() { expect().assertFail(); done(); } + }); }); } -- GitLab