未验证 提交 9be93a7d 编写于 作者: O openharmony_ci 提交者: Gitee

!8382 【OpenHarmony-3.2-Release】【杂散】【主题子系统】锁屏用例优化

Merge pull request !8382 from 张育帅/release
...@@ -8,6 +8,15 @@ ...@@ -8,6 +8,15 @@
"shell-timeout": "600000" "shell-timeout": "600000"
}, },
"kits": [ "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": [ "test-file-name": [
"ActsScreenLockETSApiTest.hap" "ActsScreenLockETSApiTest.hap"
......
...@@ -39,12 +39,11 @@ export default function ScreenLockPromiseTest(){ ...@@ -39,12 +39,11 @@ export default function ScreenLockPromiseTest(){
it("SUB_MISC_THEME_screenLock_API_Promise_001", 0, async function (done) { it("SUB_MISC_THEME_screenLock_API_Promise_001", 0, async function (done) {
console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_001-------------------"); console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_001-------------------");
try { try {
screenLock.isScreenLocked().then((data) => { let data = await screenLock.isScreenLocked();
console.info("SUB_MISC_THEME_screenLock_API_Promise_001 isScreenLocked result is " + data); console.info("SUB_MISC_THEME_screenLock_API_Promise_001 isScreenLocked result is " + data);
expect(data == result).assertTrue() expect(data == result).assertTrue()
console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_001-------------------"); console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_001-------------------");
done(); done();
})
} catch (error) { } catch (error) {
console.info("SUB_MISC_THEME_screenLock_API_Promise_001 test_setScreenLocked : error = " + error); console.info("SUB_MISC_THEME_screenLock_API_Promise_001 test_setScreenLocked : error = " + error);
expect().assertFail(); expect().assertFail();
...@@ -64,12 +63,11 @@ export default function ScreenLockPromiseTest(){ ...@@ -64,12 +63,11 @@ export default function ScreenLockPromiseTest(){
it("SUB_MISC_THEME_screenLock_API_Promise_002", 0, async function (done) { it("SUB_MISC_THEME_screenLock_API_Promise_002", 0, async function (done) {
console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_002-------------------"); console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_002-------------------");
try { try {
screenLock.isScreenLocked().then((data) => { let data = await screenLock.isScreenLocked();
console.info("SUB_MISC_THEME_screenLock_API_Promise_002 isScreenLocked result is " + data); console.info("SUB_MISC_THEME_screenLock_API_Promise_002 isScreenLocked result is " + data);
expect(data == result).assertTrue(); expect(data == result).assertTrue()
console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_002-------------------"); console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_002-------------------");
done(); done();
});
} catch (error) { } catch (error) {
console.info("SUB_MISC_THEME_screenLock_API_Promise_002 test_setScreenLocked : error = " + error); console.info("SUB_MISC_THEME_screenLock_API_Promise_002 test_setScreenLocked : error = " + error);
expect().assertFail(); expect().assertFail();
...@@ -89,12 +87,11 @@ export default function ScreenLockPromiseTest(){ ...@@ -89,12 +87,11 @@ export default function ScreenLockPromiseTest(){
it("SUB_MISC_THEME_screenLock_API_Promise_003", 0, async function (done) { it("SUB_MISC_THEME_screenLock_API_Promise_003", 0, async function (done) {
console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_003-------------------"); console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_003-------------------");
try { try {
screenLock.isSecureMode().then((data) => { let data = await screenLock.isSecureMode();
console.info("SUB_MISC_THEME_screenLock_API_Promise_003 isScreenLocked result is " + data); console.info("SUB_MISC_THEME_screenLock_API_Promise_003 isScreenLocked result is " + data);
expect(data == false).assertTrue(); expect(data == false).assertTrue()
console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_003-------------------"); console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_003-------------------");
done(); done();
});
} catch (error) { } catch (error) {
console.info("SUB_MISC_THEME_screenLock_API_Promise_003 isScreenLocked TRUE: error = " + error); console.info("SUB_MISC_THEME_screenLock_API_Promise_003 isScreenLocked TRUE: error = " + error);
expect().assertFail(); expect().assertFail();
...@@ -113,19 +110,15 @@ export default function ScreenLockPromiseTest(){ ...@@ -113,19 +110,15 @@ export default function ScreenLockPromiseTest(){
it("SUB_MISC_THEME_screenLock_API_Promise_004", 0, async function (done) { it("SUB_MISC_THEME_screenLock_API_Promise_004", 0, async function (done) {
console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_004-------------------"); console.info("------------------start SUB_MISC_THEME_screenLock_API_Promise_004-------------------");
try { try {
screenLock.unlockScreen().then((data) => { let data = await screenLock.unlockScreen();
console.info("====>SUB_MISC_THEME_screenLock_API_Promise_004 success."); console.info("====>SUB_MISC_THEME_screenLock_API_Promise_004 success.");
console.info('====>-------------SUB_MISC_THEME_screenLock_API_Promise_004 end----------------------'); expect(true).assertTrue()
expect(true).assertTrue() console.info('====>-------------SUB_MISC_THEME_screenLock_API_Promise_004 end----------------------');
done(); done();
}).catch( err => { } catch (error) {
console.info("====>SUB_MISC_THEME_screenLock_API_Promise_004 failed because: " + JSON.stringify(err)); console.info("====>SUB_MISC_THEME_screenLock_API_Promise_004: error = " + error);
expect().assertFail(); expect().assertFail();
done(); done();
});
} catch (error) {
console.info("====>SUB_MISC_THEME_screenLock_API_Promise_004: error = " + error);
expect().assertFail();
} }
console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_004-------------------"); console.info("------------------end SUB_MISC_THEME_screenLock_API_Promise_004-------------------");
}); });
......
...@@ -54,7 +54,6 @@ export default function screenLockJSUnit() { ...@@ -54,7 +54,6 @@ export default function screenLockJSUnit() {
}catch(err){ }catch(err){
console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0001 throw_err = " + err); console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0001 throw_err = " + err);
expect().assertFail();
done(); done();
} }
}); });
...@@ -84,7 +83,6 @@ export default function screenLockJSUnit() { ...@@ -84,7 +83,6 @@ export default function screenLockJSUnit() {
done(); done();
}catch(err){ }catch(err){
console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0002 throw_err = " + err); console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0002 throw_err = " + err);
expect().assertFail();
done(); done();
} }
}); });
...@@ -114,7 +112,6 @@ export default function screenLockJSUnit() { ...@@ -114,7 +112,6 @@ export default function screenLockJSUnit() {
done(); done();
}catch(err){ }catch(err){
console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0003 throw_err = " + err); console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0003 throw_err = " + err);
expect().assertFail();
done(); done();
} }
}); });
...@@ -150,7 +147,6 @@ export default function screenLockJSUnit() { ...@@ -150,7 +147,6 @@ export default function screenLockJSUnit() {
done(); done();
}catch(err){ }catch(err){
console.info('====>SUB_MISC_THEME_screenLock_API_0004 throw_err : ' + JSON.stringify(err)); console.info('====>SUB_MISC_THEME_screenLock_API_0004 throw_err : ' + JSON.stringify(err));
expect().assertFail();
done(); done();
} }
}); });
...@@ -180,7 +176,6 @@ export default function screenLockJSUnit() { ...@@ -180,7 +176,6 @@ export default function screenLockJSUnit() {
done(); done();
}catch(err){ }catch(err){
console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0007 throw_err = " + err); console.info("====>logMessage SUB_MISC_THEME_screenLock_API_0007 throw_err = " + err);
expect().assertFail();
done(); done();
} }
}); });
...@@ -189,6 +184,7 @@ export default function screenLockJSUnit() { ...@@ -189,6 +184,7 @@ export default function screenLockJSUnit() {
expect().assertFail(); expect().assertFail();
done(); done();
} }
}); });
}); });
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册