From 18e251d211f2e2c5d3834fb7adbb51e195642dbe Mon Sep 17 00:00:00 2001 From: m00512953 Date: Fri, 23 Dec 2022 15:53:43 +0800 Subject: [PATCH] mingxihua@huawei.com.cn Signed-off-by: m00512953 --- .../actsonandoffscreentest/Test.json | 17 ---------- .../main/ets/test/OnAndOffScreenTest.test.ets | 8 ----- .../actsfeatureabilitytest/Test.json | 17 ---------- .../main/js/test/FeatureAbilityJsunit.test.js | 29 ++++++++---------- .../main/js/test/StartAbilityJsunit.test.js | 24 --------------- .../signature/openharmony_sx.p7b | Bin 3653 -> 3941 bytes .../signature/openharmony_sx.p7b | Bin 3665 -> 3951 bytes .../signature/openharmony_sx.p7b | Bin 3650 -> 3936 bytes .../signature/openharmony_sx.p7b | Bin 3655 -> 3941 bytes .../startability/signature/openharmony_sx.p7b | Bin 3640 -> 3927 bytes .../signature/openharmony_sx.p7b | Bin 3649 -> 3936 bytes .../signature/openharmony_sx.p7b | Bin 3650 -> 3936 bytes 12 files changed, 12 insertions(+), 83 deletions(-) diff --git a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/Test.json b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/Test.json index 8250ec410..4553d0904 100644 --- a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/Test.json +++ b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/Test.json @@ -17,23 +17,6 @@ ], "type": "AppInstallKit", "cleanup-apps": true - }, - { - "type": "ShellKit", - "run-command": [ - "param set persist.ace.testmode.enabled 1", - "param set persist.sys.suspend_manager_enabled 0", - "reboot", - "power-shell wakeup", - "hilog -Q pidoff", - "hilog -b DEBUG", - "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100", - "power-shell setmode 602" - ], - "teardown-command": [ - "param set persist.sys.suspend_manager_enabled 1", - "reboot" - ] } ] } diff --git a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/test/OnAndOffScreenTest.test.ets b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/test/OnAndOffScreenTest.test.ets index 807396215..5a8bf0ef9 100644 --- a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/test/OnAndOffScreenTest.test.ets +++ b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/test/OnAndOffScreenTest.test.ets @@ -17,9 +17,6 @@ import commonEvent from '@ohos.commonEvent'; import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; import power from '@ohos.power'; import backgroundTaskManager from '@ohos.backgroundTaskManager'; -import { BY, UiDriver, UiComponent, MatchPattern } from '@ohos.uitest'; - -var driver; function sleep(ms) { return new Promise(resolve => setTimeout(resolve, ms)); @@ -42,7 +39,6 @@ export default function OnAndOffScreenTest() { }) id = delayInfo.requestId; console.log(TAG1 + "requestId is : " + id); - driver = await UiDriver.create(); setTimeout(function () { console.log(TAG1 + "beforeAll end"); done(); @@ -52,10 +48,6 @@ export default function OnAndOffScreenTest() { afterAll(async (done) => { console.log(TAG1 + "afterAll called"); backgroundTaskManager.cancelSuspendDelay(id); - let button = await driver.findComponent(BY.text('知道了').enabled(true)); - await sleep(4000); - await button.click(); - await sleep(2000); setTimeout(function () { console.log(TAG1 + "afterAll end"); done(); diff --git a/ability/ability_runtime/featureability/actsfeatureabilitytest/Test.json b/ability/ability_runtime/featureability/actsfeatureabilitytest/Test.json index 2df96f985..f2af25373 100644 --- a/ability/ability_runtime/featureability/actsfeatureabilitytest/Test.json +++ b/ability/ability_runtime/featureability/actsfeatureabilitytest/Test.json @@ -22,23 +22,6 @@ ], "type": "AppInstallKit", "cleanup-apps": true - }, - { - "type": "ShellKit", - "run-command": [ - "param set persist.ace.testmode.enabled 1", - "param set persist.sys.suspend_manager_enabled 0", - "reboot", - "power-shell wakeup", - "hilog -Q pidoff", - "hilog -b DEBUG", - "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100", - "power-shell setmode 602" - ], - "teardown-command": [ - "param set persist.sys.suspend_manager_enabled 1", - "reboot" - ] } ] } diff --git a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js index 57b6b9573..0467d3f53 100644 --- a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js +++ b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js @@ -19,9 +19,6 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from import commonEvent from '@ohos.commonEvent' import particleAbility from '@ohos.ability.particleAbility' import backgroundTaskManager from '@ohos.backgroundTaskManager' -import { BY, UiDriver, UiComponent, MatchPattern } from '@ohos.uitest'; - -var driver; const START_ABILITY_TIMEOUT = 4000; let subscriberInfoActsStartAbility0100 = { @@ -64,22 +61,20 @@ function sleep(time) { export default function actsFeatureAbilityTest() { describe('ActsFeatureAbilityTest', function () { - beforeAll(async (done) => { - console.info('beforeAll called') - driver = await UiDriver.create(); - await sleep(2000); - done(); + beforeAll(function() { + + /* + * @tc.setup: setup invoked before all testcases + */ + console.info('beforeAll called') }) - afterAll(async (done) => { - let button = await driver.findComponent(BY.text('知道了').enabled(true)); - await sleep(4000); - await button.click(); - await sleep(4000); - setTimeout(function () { - console.info('afterAll called') - done(); - }, 6000); + afterAll(function() { + + /* + * @tc.teardown: teardown invoked after all testcases + */ + console.info('afterAll called') }) beforeEach(function() { diff --git a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/StartAbilityJsunit.test.js b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/StartAbilityJsunit.test.js index c453f5df3..100f7e0d6 100644 --- a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/StartAbilityJsunit.test.js +++ b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/StartAbilityJsunit.test.js @@ -14,9 +14,6 @@ */ import featureAbility from '@ohos.ability.featureAbility' import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' -import { BY, UiDriver, UiComponent, MatchPattern } from '@ohos.uitest'; - -var driver; let resultCode = 123; let bundleName = 'ohso.act.aafwk'; @@ -24,29 +21,8 @@ let mainAbilityName = 'ohos.acts.aafwk.jsap'; const errCode = 1; const errCode1 = 202; -function sleep(time) { - return new Promise((resolve)=>setTimeout(resolve,time)); -} - export default function startAbilityTest() { describe('StartAbilityTest', function () { - - beforeAll(async (done) => { - driver = await UiDriver.create(); - await sleep(2000); - done(); - }) - - afterAll(async (done) => { - let button = await driver.findComponent(BY.text('知道了').enabled(true)); - await sleep(4000); - await button.click(); - await sleep(2000); - setTimeout(function () { - console.log("afterAll end"); - done(); - }, 6000); - }) afterEach(async function(done) { let wantInfo = { diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/signature/openharmony_sx.p7b b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/signature/openharmony_sx.p7b index ee506e1c0c8f6b9b8e62f9996154c1351fbe1cda..ffae2fa745bc0e6f907f8af32b1a6c4b192057d0 100644 GIT binary patch delta 670 zcmX>q^Hk2kpou?`jZ>@5qwPB{BRkWACjKCxkRKBxqam*WHydX{n+IbmGYb==K@&S8 zLLuXVCbmy3O>FNrI&5ZPE3PaqNzI-7lSQFEKO?_buOPK3H?z1nGe1wy(=Ry0(Z?s= zDb&x!$5ly330;A^YY0>_-qX*`KRzJHGtAS+)!o$vi(+RFM?ZJhct!WMlw^BGX|fxu)8zZCVw?HczOnH*88k840VCKT+aP%|Bd7gjf8LCGBVz+|19Kyz zCi#plrjz*FKk@PF&CvmcR2^{%NkCEe=}ixBuUDJK2DXjRTl| z&e^gsGqHFWxG^a*EX;FSC-%DK*1WSj_nTG8U-@+JOGVg(v*&)E=nZYoitYm{xghJa j=ALGs>EGi4`;~8*3;ON};EA$6^Q1&$x?Gj+_xi^Gj`ihL delta 370 zcmaDVcT~o~po!0sjZ>@5qwPB{BRkWACO#vekRB5wqam*WHydX{n+IbmGYb==K@;m^ zghIvzO{`Z~npiJvblA+omX}|Yo0v2CCyT=5`>eW?udq4!`IhFCWCj%FC#Mz{E9odX z=H%p;J0@l3WR_G06lLZY0qMZf)S}GP6f{}aisYQqlvKB({9ND6;^NHwJfQx`yzKH4 zP*dE1mW5>&XC~#O`sJ5ord4j%X8+E{1M~@_4ba&J*#^mz<+roGgY)EDH8N{&2{7ownpXEAHvolg;8Px==7%EX_kKmEDTT>fn0=E;bHesGPH9 zVP;}+GjL&2@VU8Q|HJL4*;#w^?gl*jv-z2Z{?lzTHD7K<`9Ev(ob;PXAwlk2kZag; fX}^@5qwPB{BRkWACjJDn5I_zg*E3PaqNzI+i%BoPGpOIgzSCCqin^|0(nV+ZU=@%U0=;IUb z6zb>Vh9`-MX|Goqo2ELyrYw+k7r0^ysMw1 zlaH%QJkW{|h}rI_wgByjSa?PsE=oGh^rsW5fCdTtFr3WW4M*R zp7BHrO0qqpG&zXXNi?)LHJ~W7EHfuHJ=L|MBsC8dKbs}lR$vI@5qwPB{BRkWACO$i$kQEanqam*WHydX{n+IbmGYb==K@;nH zghIvzO{@=Cnpp2_blA_rmX}|Yo0v11l~rN#YgXOK57?aid`ojmG6Rb8lT(X}m2{LG zb8_;_9g{M1GD|80iZb(yfOKGKYEfot3Yx5IMRHDQN~&8?ey(q3adBpT9#H>eNp^V& zs3~qh%fd2?Gm~;s{qjpP(<(Qcv#(;WH#9IXHZV3eiZalLJCl>eP>Drh-!WwyR`25# zhVR$0NiGbIDm;E?p>k)H`dqIB9+~VUT>~yQ4qyPBvt?msVsSHYVN%dk4c1uO%_O)b z)ARHp?xo6CHwP`uykyuq+3)-^3GF+wObT_Cz`s{PswN NH?BGTETMeK5&-&dc~$@b diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/signature/openharmony_sx.p7b b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/signature/openharmony_sx.p7b index 97a7418a53e260efdd7b8582b6a90781e5e9af43..1ed62dee078fe98e12b9b421a75b299b482925d3 100644 GIT binary patch delta 649 zcmX>k^FYqQpou?*jZ>@5qwPB{BRkWACVpR_kS7x(qam*WHydX{n+IbmGYb==K@-~_ zghIvzO>A#jn%G`$bXdp2R$N(JlA1gD3yVU1enx(=UO{S6Zf0?DW`3TYr(bZ0qmNI# zQ>dSdkE@c761oC+*AS>=yr-X=e|$iYXPBpttGlZU7RAmUj(+a0@s3WOKAs_w@veT3 zPCl+K@jxp=AZELx+8*TU>mTMC@9gO8;TrD-G&UHEp+26$A+CNfM?kEYEW)Z=kKtDO zdd3qiD9QGW(qu)f3s_On;b&22w>V&P4djdKIU4Y=4ifJx15{fQ0QwEV9ibG+*;?n^5^ Or)-~l-ga(s{9XV`s@jJD delta 351 zcmaDLcSy#;po!0pjZ>@5qwPB{BRkWACO&&XC~#O`sJ5ord4iMV_(HyZ)jj(Y+zz&7GvGvtWUC-wPO)^;&^TvRSjRP0}=WJP+nOHmw+?W&@PS5wK>Mkh# z?t1FM^!;`b>&reS-3u1A{N!KS%&r+y*9BDafce+awcOG^z3gQzPW~c-yKOH=C|$i^ OCQ}mi-?2Gk`YixopL{t0 diff --git a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/signature/openharmony_sx.p7b b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/signature/openharmony_sx.p7b index c6623404e1ae972ae1bdc9dd2962762e37cf4006..29b79c17e2a4910ac2303c1f7c41440a45b366f0 100644 GIT binary patch delta 647 zcmX>u^Hk2kpou?`jZ>@5qwPB{BRkWACjKCxkRKBxqam*WHydX{n+IbmGYb==K@&SO zLLuXVCblmuO>7@FI&5WOE3PaqNzI-7n?<2MKO?_buOPK3H?z1nGe1wy(=Ry0(Z?s= zDb&x!$5ly330;A^YY0>_-qX*`KRzJHGtAS+)!o$vi(+RFM?ZJhct!WMlw^BGX|e~a)8vP&Vw(lnR@5qwPB{BRkWACO#9OkO31Tqam*WHydX{n+IbmGYb==K@;m! zghIvzO{~{gnpiJwblA$mmX}|Yo0v2CH;cmLhpf7judzA#`IhFCWCj%FC#Mz{E9odX z=H%p;J0@l3WR_G06lLZY0qMZf)S}GP6f{}aisYQqlvKB({9ND6;^NHwJfQx`{Os}) zP*dE1mW5>&XC~#O`sJ5ord4j%WnaZ!Z)jj(Y+zz)9A%&ncP1x`p%RONK*fyd4!`u3 z5;~Qa+FO_Xo|jafa;*3EnHRPUS41+`yf@%t;{XQ0Ia?NHCKfjX7bXRTioSk@5qwPB{BRkWACVm&7kOLDVqam*WHydX{n+IbmGYb==K@-~- zghIvzO>9qDn%Ew0bXdm1R$N(JlA1gD4U0m3enx(=UO{S6Zf0?DW`3TYr(bZ0qmNI# zQ>dSdkE@c761oC+*AS>=yr-X=e|$iYXPBpttGlZU7RAmUj(+a0@s3WOKAs_w@veT3 zPCl+K@jxp=AZELx+8*TU>mTMC@9gO8;TrD-G&UHEp+26$A+CNfM?kEY%)_c%kKtDO zdd3qiD9QGW(qv0kr^%OC#WpjtePd&FG-zV9o&1Mq9lMdSfw`fv@#KxX!lmEu)%zqB zN&fw)=&38OtJc8c&G>BIMd?Yghi*GD>E}N+;9}zdCX;ivEX+(S?gp+*iVRDX4P$L< z&V5{6J6BEKP%ZY6Zq$KC+)H9p?ECg9SIggHQpnZZ;FhoV`|q)H4NZ-=q>d@Gzv%yZ PfFosI+k)+q*R^^9evH^e delta 358 zcmcaEw?oFkpo!0fjZ>@5qwPB{BRkWACO%c5kRlT!qam*WHydX{n+IbmGYb==K@;mW zghIvzO{~XRnph8SbXdm1mX}|Yo0v2C4U59$ORTz+kFz=X`IhFCWCj%FC#Mz{E9odX z=H%p;J0@l3WR_G06lLZY0qMZf)S}GP6f{}aisYQqlvKB({9ND6;^NHwJfQwb?D7&& zL)?INg=H3JCgr61<(FipRc@AJ|IWq=^a!KPWGTLN^@aup#s;QF=1~UvaQAYu7%H(S zgfMx{x7sE1?@HK>8+js!9J>_sLzc_O9oH`SyvFK8<~9Q^HV$A&oU>(NW@2$OaA8sq zJ7wTozH8at+t+4HzmadTt8Tho^FYqQpou?*jZ>@5qwPB{BRkWACVpR_kS7x(qam*WHydX{n+IbmGYb==K@;0w zghIvzO>FO2n%G`#bXd>AR$N(JlA1gDD~m#Xenx(=UO{S6Zf0?DW`3TYr(bZ0qmNI# zQ>dSdkE@c761oC+*AS>=yr-X=e|$iYXPBpttGlZU7RAmUj(+a0@s3WOKAs_w@veT3 zPCl+K@jxp=AZELx+8*TU>mTMC@9gO8;TrD-G&UHEp+26$A+CNfM?kEYEXt}|kKtDO zdd3qiD9QGW(qt!AC(+R2)PSPQvdo;+^i2R!wfCoRxb|=6%S!T0b3PL~OKdJ% z?4CPQ?(TeSz{SP^Oi$-*S(uqv+znir6d9g#F5J45CDBJj;EA~9vAt*X56#~&qhdnf_>UbkQK-jGynp(q{32>?is@5qwPB{BRkWACO$o&kQNgoqam*WHydX{n+IbmGYb==K@;nJ zghIvzO{^DKnpn?lbXd>AmX}|Yo0v2CD~rP9+pM~iFR(fJ`IhFCWCj%FC#Mz{E9odX z=H%p;J0@l3WR_G06lLZY0qMZf)S}GP6f{}aisYQqlvKB({9ND6;^NHwJfQx`ob2)v zP*dE1mW5>&XC~#O`sJ5ord4iMXaCN|1@sA{4ba&J*^?7_QYZKFxzrmP7#JIvnp#E~ z=)+yk$zrGkbmjq5^OcV}!lvvgIwrC3^ebLqOHBwPLQCC+~Bz{k{wUq!@uE diff --git a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/signature/openharmony_sx.p7b b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/signature/openharmony_sx.p7b index 601dbe3e7e5373d3c773ec71cf509d8e5a182078..15c1cb27ac853d5a083fae7c1c6fcc6ca90e047b 100644 GIT binary patch delta 649 zcmX>k^FYqQpou?*jZ>@5qwPB{BRkWACVpR_kS7x(qam*WHydX{n+IbmGYb==K@-~_ zghIvzO>A#jn%G`$bXdp2R$N(JlA1gD3yVU1enx(=UO{S6Zf0?DW`3TYr(bZ0qmNI# zQ>dSdkE@c761oC+*AS>=yr-X=e|$iYXPBpttGlZU7RAmUj(+a0@s3WOKAs_w@veT3 zPCl+K@jxp=AZELx+8*TU>mTMC@9gO8;TrD-G&UHEp+26$A+CNfM?kEYEW)Z=kKtDO zdd3qiD9QGW(qu#xgQpJ z*&I&TcRbn3yDjZF@2q;YlRI)gDZV?JX28Y90Zc0AY+0C@SUe2em=qbNUtGkHZFqXq zMDa5fyXwjW-9s$0A8$KY5I*a=!|C~+)j%Z;uU4;?u6;3QR_w9NxZnDME@75s@4L8X OtdMm7W#)ZXVk-a+V%o9* delta 351 zcmaDLcSy#;po!0pjZ>@5qwPB{BRkWACO&&XC~#O`sJ5ord4iMV_(HyZ)jj(Y+z<$6lI_fcP1x`p%RNiWd41|`%~7g zKlk{SfRV#89dGq~+a+_A&L4_3sBG@?JZ8Yf#sLg~bG9tZOe`J-ZcK^{O|CDc?{@zY ziIo(7q33%4&-