From 1e6b738f4df6f28d7992d3af46ecd9006e4f78d3 Mon Sep 17 00:00:00 2001 From: chengxingzhen Date: Wed, 14 Sep 2022 20:27:39 +0800 Subject: [PATCH] =?UTF-8?q?XTS=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chengxingzhen --- .../entry/src/main/ets/test/Ability.test.ets | 4 -- .../entry/src/main/ets/test/Ability.test.ets | 35 +++++------------- .../signature/openharmony_sx.p7b | Bin 3443 -> 3539 bytes 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/test/Ability.test.ets index f5a78b314..ade57a953 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/test/Ability.test.ets @@ -32,7 +32,6 @@ export default function abilityTest() { var msg = '测试日志!@#$%^&*()_+QWE{}|?> " ) - await sleep(1000) var finishmsg = 'ACTS_AACommand_printSync_01_0100 end' globalThis.abilityDelegator.finishTest(finishmsg, 1).then((data)=>{ console.log("ACTS_AACommand_printSync_01_0100 finishTest test end ========> callback " ) @@ -63,7 +62,6 @@ export default function abilityTest() { '9aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaae' globalThis.abilityDelegator.printSync(msg); console.log("ACTS_AACommand_printSync_01_0200 printSync end ====> " ) - await sleep(1000) var finishmsg = 'ACTS_AACommand_printSync_01_0200 end' globalThis.abilityDelegator.finishTest(finishmsg, 1).then(()=>{ console.log("ACTS_AACommand_printSync_01_0200 print test end ========> callback " ) @@ -93,7 +91,6 @@ export default function abilityTest() { 'fffffffffff' globalThis.abilityDelegator.printSync(msg); console.log("ACTS_AACommand_printSync_01_0300 printSync end ====> " ) - await sleep(1000) var finishmsg = 'ACTS_AACommand_printSync_01_0300 end' globalThis.abilityDelegator.finishTest(finishmsg, 1).then(()=>{ console.log("ACTS_AACommand_printSync_01_0300 print test end ========> callback " ) @@ -111,7 +108,6 @@ export default function abilityTest() { it('ACTS_AACommand_printSync_01_0400', 0, async function (done) { globalThis.abilityDelegator.printSync(null); console.log("ACTS_AACommand_printSync_01_0300 printSync end ====> " ) - await sleep(1000) var finishmsg = 'ACTS_AACommand_printSync_01_0400 end' globalThis.abilityDelegator.finishTest(finishmsg, 1).then(()=>{ console.log("ACTS_AACommand_printSync_01_0400 print test end ========> callback " ) diff --git a/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/test/Ability.test.ets index 7b3dc3d20..46b9bfff1 100644 --- a/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/test/Ability.test.ets @@ -352,17 +352,12 @@ export default function abilityTest() { */ it('ACTS_AACommand_finish_01_0800', 0, async function (done) { var msg = '测试日志!@#$%^&*()_+QWE{}|?> { - console.log('ACTS_AACommand_finish_01_0800 code:'+JSON.stringify(code)) - if(code!=undefined){ - expect().assertFail(); - } - done(); - }, 3000) - var code = globalThis.abilityDelegator.finishTest(msg, 'ABCD',()=>{ + globalThis.abilityDelegator.finishTest(msg, 'ABCD',()=>{ console.log(" ACTS_AACommand_finish_01_0800 finishTest test end ========> callback " ) expect().assertFail(); }) + await sleep(2000); + done(); }) /** @@ -388,15 +383,9 @@ export default function abilityTest() { * @tc.desc: Verify that the process of the test framework can be stopped by calling this interface. */ it('ACTS_AACommand_finish_01_1000', 0, async function (done) { - var code = null - setTimeout(() => { - console.log('ACTS_AACommand_finish_01_1000 code:'+JSON.stringify(code)) - if(code!=undefined){ - expect().assertFail(); - } - done(); - }, 3000) - code = globalThis.abilityDelegator.finishTest(null, 1) + globalThis.abilityDelegator.finishTest(null, 1) + await sleep(2000); + done() }) /** @@ -406,15 +395,9 @@ export default function abilityTest() { * @tc.desc: Verify that the process of the test framework can be stopped by calling this interface. */ it('ACTS_AACommand_finish_01_1100', 0, async function (done) { - var code=null - setTimeout(() => { - console.log('ACTS_AACommand_finish_01_1100 code:'+JSON.stringify(code)) - if(code!=undefined){ - expect().assertFail(); - } - done(); - }, 3000) - code = globalThis.abilityDelegator.finishTest(undefined, 1) + globalThis.abilityDelegator.finishTest(undefined, 1) + await sleep(2000); + done() }) /** diff --git a/ability/ability_runtime/apicover/apicoverhaptest/signature/openharmony_sx.p7b b/ability/ability_runtime/apicover/apicoverhaptest/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..6c7c8e29e3c4a1f8d0419932ebc28f665e4ae974 100644 GIT binary patch delta 457 zcmew?by>RJpo#Z98>d#AN85K^Ms}tJO}qzyLVK7P84Y<2xY;-p+B_IjnOT?^4VqXB z5egX>G_fYJG_l52E0v`d6=&w>>E!?=i9G_@izw;(4~FSin? zJ0~+a5u|bQAr^C~#N?b}C97(s#GIV`^3)Vv2tQg$DR%NV7FQRDbp=J4Wtlmt>8ZNO zi3N#CnK_vynW;c+(MpaWZH@&6p~a~IFh#BvC8>EJuPEu{mFDEcZnkFq%Eskj(8Op1 z3=V_r$%(9~ljrj|*IOEz7+9DX8kM~7nKmu(1G zpYJ_&dR0fI#Kn9;*Z4vvh0IjR1eJ+P&T02_PHgYg+8_{Fv)r)#+p9BQbBwl~OF6p- E0L*}*=l}o! delta 340 zcmcaC{aGsApour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcI&gu!#9W|&lA)e~p25TkhWsU!1t5M= zYEEimajMe94DE>rZ8q~UE?^e%FG$VvNG!_D&#Tl+EGW<`Ni8m!e3-?2vN)^L=DDn2 z*?61`ni%bXt}@6rNS@r!VL$mUPkOzPfrWv&p^=Gklz~3nZJaEIN-PR}1yXukQq`h< zwn}TXTV|*}JN(`(&`0dylJqYH$v^hbFyLb20Q&lzEekUfi-&<5lOn^jAlsDrM`QO$ zN4uJS`91N9!h+Nbol~~vZkoy<{OF^=8=#VT5gSd