From e2d2f2f7372d5024023bbde61365b17b9686f118 Mon Sep 17 00:00:00 2001 From: limeng Date: Mon, 3 Jul 2023 22:39:23 +0800 Subject: [PATCH] =?UTF-8?q?Swiper=E7=BB=84=E4=BB=B6=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: limeng --- arkui/BUILD.gn | 1 + .../AppScope/app.json | 19 +++ .../resources/base/element/string.json | 8 ++ .../resources/base/media/app_icon.png | Bin 0 -> 6790 bytes arkui/ace_ets_component_api_five/BUILD.gn | 43 ++++++ arkui/ace_ets_component_api_five/Test.json | 26 ++++ .../signature/openharmony_sx.p7b | Bin 0 -> 3445 bytes .../src/main/ets/TestAbility/TestAbility.ets | 63 +++++++++ .../src/main/ets/TestAbility/pages/Index.ets | 58 ++++++++ .../ets/TestAbility/pages/SwiperMargin.ets | 130 +++++++++++++++++ .../ets/TestRunner/OpenHarmonyTestRunner.ts | 84 +++++++++++ .../src/main/ets/test/List.test.ets | 19 +++ .../src/main/ets/test/SwiperMargin.test.ets | 132 ++++++++++++++++++ .../src/main/module.json | 41 ++++++ .../main/resources/base/element/color.json | 20 +++ .../main/resources/base/element/string.json | 40 ++++++ .../src/main/resources/base/media/icon.png | Bin 0 -> 6790 bytes .../resources/base/profile/test_pages.json | 6 + 18 files changed, 690 insertions(+) create mode 100644 arkui/ace_ets_component_api_five/AppScope/app.json create mode 100644 arkui/ace_ets_component_api_five/AppScope/resources/base/element/string.json create mode 100644 arkui/ace_ets_component_api_five/AppScope/resources/base/media/app_icon.png create mode 100644 arkui/ace_ets_component_api_five/BUILD.gn create mode 100644 arkui/ace_ets_component_api_five/Test.json create mode 100644 arkui/ace_ets_component_api_five/signature/openharmony_sx.p7b create mode 100644 arkui/ace_ets_component_api_five/src/main/ets/TestAbility/TestAbility.ets create mode 100644 arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/Index.ets create mode 100644 arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/SwiperMargin.ets create mode 100644 arkui/ace_ets_component_api_five/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts create mode 100644 arkui/ace_ets_component_api_five/src/main/ets/test/List.test.ets create mode 100644 arkui/ace_ets_component_api_five/src/main/ets/test/SwiperMargin.test.ets create mode 100644 arkui/ace_ets_component_api_five/src/main/module.json create mode 100644 arkui/ace_ets_component_api_five/src/main/resources/base/element/color.json create mode 100644 arkui/ace_ets_component_api_five/src/main/resources/base/element/string.json create mode 100644 arkui/ace_ets_component_api_five/src/main/resources/base/media/icon.png create mode 100644 arkui/ace_ets_component_api_five/src/main/resources/base/profile/test_pages.json diff --git a/arkui/BUILD.gn b/arkui/BUILD.gn index f8af0fcc3..c28988afc 100644 --- a/arkui/BUILD.gn +++ b/arkui/BUILD.gn @@ -16,6 +16,7 @@ group("arkui") { deps = [ "ace_ets_component:ActsAceEtsComponentTest", "ace_ets_component_api:ActsAceComponentApi03Test", + "ace_ets_component_api_five:ActsAceComponentApi06Test", "ace_ets_component_api_four:ActsAceComponentApi05Test", "ace_ets_component_api_three:ActsAceComponentApi04Test", "ace_ets_component_api_two:ActsAceComponentApi02Test", diff --git a/arkui/ace_ets_component_api_five/AppScope/app.json b/arkui/ace_ets_component_api_five/AppScope/app.json new file mode 100644 index 000000000..da4d2d6aa --- /dev/null +++ b/arkui/ace_ets_component_api_five/AppScope/app.json @@ -0,0 +1,19 @@ +{ + "app": { + "bundleName": "com.open.harmony.componentapi06", + "vendor": "example", + "versionCode": 1000000, + "versionName": "1.0.0", + "icon": "$media:app_icon", + "label": "$string:app_name", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/AppScope/resources/base/element/string.json b/arkui/ace_ets_component_api_five/AppScope/resources/base/element/string.json new file mode 100644 index 000000000..30af7cfee --- /dev/null +++ b/arkui/ace_ets_component_api_five/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"MyApplication" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_component_api_five/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 zcmX|G1ymHk)?T_}Vd;>R?p|tHQo6fg38|$UVM!6BLrPFWk?s;$LOP{GmJpBl$qoSA!PUg~PA65-S00{{S`XKG6NkG0RgjEntPrmV+?0|00mu7;+5 zrdpa{2QLqPJ4Y{j7=Mrl{BaxrkdY69+c~(w{Fv-v&aR%aEI&JYSeRTLWm!zbv;?)_ ziZB;fwGbbeL5Q}YLx`J$lp~A09KK8t_z}PZ=4ZzgdeKtgoc+o5EvN9A1K1_<>M?MBqb#!ASf&# zEX?<)!RH(7>1P+j=jqG(58}TVN-$psA6K}atCuI!KTJD&FMmH-78ZejBm)0qc{ESp z|LuG1{QnBUJRg_E=h1#XMWt2%fcoN@l7eAS!Es?Q+;XsRNPhiiE=@AqlLkJzF`O18 zbsbSmKN=aaq8k3NFYZfDWpKmM!coBU0(XnL8R{4=i|wi{!uWYM2je{U{B*K2PVdu&=E zTq*-XsEsJ$u5H4g6DIm2Y!DN`>^v|AqlwuCD;w45K0@eqauiqWf7l&o)+YLHm~|L~ z7$0v5mkobriU!H<@mVJHLlmQqzQ3d6Rh_-|%Yy2li*tHO>_vcnuZ7OR_xkAIuIU&x z-|8Y0wj|6|a6_I(v91y%k_kNw6pnkNdxjqG8!%Vz_d%c_!X+6-;1`GC9_FpjoHev5fEV7RhJ>r=mh-jp$fqbqRJ=obwdgLDVP5+s zy1=_DWG0Y-Jb3t^WXmkr(d9~08k-|#Ly zaNOmT(^9tIb&eb4%CzIT zAm3CUtWSr1t4?h1kk#NBi{U|pJslvME{q|_eS^3En>SOqSxyuN1x;Is@8~m?*>}** znrRFArP!K_52RpX*&JHMR<^lVdm8ypJ}0R(SD(51j;6@ni$6bQ+2XL+R^|NnSp5}(kzvMZ^(@4fD_{QVu$(&K6H|C37TG1Am9Re{<<3gd zh@`>;BqkXMW&p0T6rt|iB$)~CvFe(XC)F9WgAZn*0@t$oZo;!*}r@_`h?KKH&6A@3= zISXoQB+~`op>NP-buiA*^0n{@i{_?MRG)&k)c)k_F+-2Lud!S9pc+i`s74NpBCaGF zXN+pHkubw*msGBTY27BKHv)RRh3;nMg4&$fD_6X9Vt~;_4D+5XPH~#Kn-yjcy!$}1 zigv#FNY>TqMhtIBb@UoF!cE~Q8~;!Pek>SQQwHnHuWKoVBosAiOr}q>!>aE*Krc)V zBUMEcJ5NU0g8}-h6i1zpMY9>m4ne?=U2~`w7K7Q0gB_=p@$5K7p6}thw z-~3dMj?YNX2X$lZ+7ngQ$=s}3mizNN@kE%OtB)?c&i~2L55z8^=yz;xMHLmlY>&Q# zJj?!)M#q_SyfkQh)k?j8IfLtB)ZCp|*vf4_B zos?73yd^h-Ac+;?E4*bpf=o*^3x3-`TVjbY4n6!EN10K6o@fxdyps05Vo3PU)otB} z`3kR+2w7_C#8Z!q`J)p{Vh!+m9-UP!$STp+Hb}}#@#_u^SsUQg<}59< zTvH3%XS4G+6FF^(m6bVF&nSUIXcl;nw{=H$%fgeJ>CgDYiLdpDXr{;-AnG z8dvcrHYVMI&`R6;GWekI@Ir3!uo)oz4^{6q0m^}@f2tM9&=YHNi6-?rh0-{+k@cQm zdp`g#YdQn%MDVg2GR>wZ`n2<0l4)9nx1Wfr&!Dvz=bPwU!h2S?ez6MVc5APE4-xLB zi&W9Q8k2@0w!C53g?iAIQ}~p*3O(@zja6KQ=M3zfW*_6o5SwR-)6VBh~m7{^-=MC-owYH5-u40a}a0liho3QZZ5L{bS_xM1)4}19)zTU$$MY zq3eZML1WC{K%YFd`Be0M-rkO^l?h{kM{$2oK1*A@HVJ57*yhDkUF!2WZ&oA4Y-sK( zCY69%#`mBCi6>6uw(x4gbFaP0+FD*JKJ-q!F1E?vLJ+d35!I5d7@^eU?(CS|C^tmI5?lv@s{{*|1F zFg|OzNpZ0hxljdjaW%45O0MOttRrd(Z?h{HYbB-KFUx&9GfFL3b8NwZ$zNu)WbBD` zYkj$^UB5%3Pj1MDr>S2Ejr9pUcgA!;ZG!@{uAy12)vG=*^9-|dNQBc8&`oxBlU~#y zs!anJX&T?57Jdr^sb>e+V`MVfY>Y0ESg7MG<7W0g&bR-ZYzzZ%2H&Etcp zcd6QeXO1D!5A#zM0lx*GH}`M)2~ZFLE;sP^RSB5wVMNfiZXPd(cmO>j=OSA3`o5r& zna(|^jGXbdN7PK)U8b7^zYtYkkeb%<%F~=OqB~kXMQkq}ii|skh@WSRt>5za;cjP0 zZ~nD%6)wzedqE}BMLt~qKwlvTr33))#uP~xyw#*Eaa|DbMQ_%mG0U8numf8)0DX`r zRoG2bM;#g|p-8gWnwRV5SCW0tLjLO&9Z?K>FImeIxlGUgo0Zk`9Qzhj1eco~7XZy+hXc@YF&ZQ=? zn*^1O56yK^x{y}q`j7}blGCx%dydV!c7)g~tJzmHhV=W~jbWRRR{1<^oDK+1clprm zz$eCy7y9+?{E|YgkW~}}iB#I4XoJ*xr8R?i_Hv$=Cof5bo-Nj~f`-DLebH}&0% zfQj9@WGd4;N~Y?mzQsHJTJq6!Qzl^-vwol(+fMt#Pl=Wh#lI5Vmu@QM0=_r+1wHt` z+8WZ~c2}KQQ+q)~2Ki77QvV&`xb|xVcTms99&cD$Zz4+-^R4kvUBxG8gDk7Y`K*)JZ^2rL(+ZWV~%W(@6 z)0bPArG#BROa_PHs~&WplQ_UIrpd)1N1QGPfv!J(Z9jNT#i%H?CE6|pPZb9hJ1JW4 z^q;ft#!HRNV0YgPojzIYT`8LuET2rUe-J|c!9l4`^*;4WtY@Ew@pL>wkjmMgGfN7 ze}}GtmU0@<_#08~I-Suk=^*9GLW=H4xhsml;vAV{%hy5Eegl@!6qKqbG024%n2HHw zCc@ivW_$@5ZoHP70(7D+(`PvgjW1Pd`wsiuv-aCukMrafwDm)B!xXVy*j2opohhoU zcJz%ADmj>i3`-3-$7nQKBQQuGY;2Qt&+(L~C>vSGFj5{Mlv?T_^dql;{zkpe4R1}R z%XfZyQ}wr*sr>jrKgm*PWLjuVc%6&&`Kbf1SuFpHPN&>W)$GmqC;pIoBC`=4-hPY8 zT*>%I2fP}vGW;R=^!1be?ta2UQd2>alOFFbVl;(SQJ4Jk#)4Z0^wpWEVvY4=vyDk@ zqlModi@iVPMC+{?rm=4(n+<;|lmUO@UKYA>EPTS~AndtK^Wy^%#3<;(dQdk3WaUkRtzSMC9}7x2||CNpF#(3T4C)@ z$~RWs`BNABKX|{cmBt>Q=&gkXl&x!!NK_%5hW0LS)Z4PB>%sV?F-{Wyj#s7W%$F{D zXdK^Fp3wvy+48+GP6F_|^PCRx=ddcTO3sG;B23A49~Qaw31SZ0Rc~`r4qqt%#OGW{ zCA_(LG5^N>yzUn&kAgVmxb=EA8s&tBXC}S1CZ(KoW)(%^JjLTPo^fs`Va;`=YlVPgmB$!yB}<(4ym6OeZ3xAJJ#;)2+B%p3P1Wt+d$eo`vz`T zXfUP2))kBDPoscH;Jc7I3NU<({|@wM$&GaDt`n7WLgIY3IA7A6-_R?z8N3mz|}*i z(zl5ot--Oq@f2-nv{X(ujT2T(k1vY_qh93pK@>H-qc%2Xta)IP0Q%zt%bqYgI`o!wv!0QerB`nCN^1n|@$sVOQ!V0teVG!I z_fD%JvfDeT1cK#-{o6Gv7}& zY0#NWin~kVaf$aufV&;63Hbs|`QVZWpDX6IMk1Hj2G}fiH9e-^6u2zf^FIr^BwD<6zjw63+{yUe8PUFvk8v{sJ=R{d#`O!sz`Q13~< zPT$JS(w=yQfU2`zPCNfSw=&zup@DXc(98afjhv@1w_f!m2Z>rMJ19AB&dB%P#Ls3b z=lK7OILM+SQ&VEd=1GN6o&>YVVtIzoZ%=Z_SdqJN2}E43{bE`>w+A;=y->@^k{oCC z$F*WTY&?34;kfyFV?b*Xb1Pq`Z=%OgwEg)Rz)tx=`f%5#w_INP=x&z5!jI;#;N$ma zhO)+MDm;SxOEVL15; zGq(v2pL3&P1Sl)8P*;G-fd{l1QJsv@e@d8)1PK4w2m*M%V3j-V~L^$i|&C@b?D?9tfwE{B^}Z$k8e5FmQ>v7Xz)sG32g9t}YBt zyR$+*_00RmPx+0mW+vVG4mxd(n$(eQf3-w>JPl2UJpafrPaL5@2j}%{VE-) zBI%6Qpj*dsdH<;g!S!avA~bv^0E+ zfyJbSjPb+j;J52U)<|cIcntQBI2T#>2;tOxu{%D?kML476AErF(qN9hPva5Nkc@BF zC-tLF@3ZFb%Kpj)M<{)x*l|*Ia@ECeXo2E4h2f!aV=cHAhi_E_mfUth(sM4^hJq7B zQsGWqdZUm9S%F`$nQ*_#NcuD`&)Ek%_s{&^78{9Hm ztri&rYLOxgFdG>O@+XHy z9#;|&vBCPXH5Mon^I`jSuR$&~ZWtyB67ujzFSj!51>#C}C17~TffQ{c-!QFQkTQ%! zIR^b1`zHx|*1GU?tbBx23weFLz5H?y_Q%N&t$}k?w+``2A=aotj0;2v$~AL z{scF-cL{wsdrmPvf#a9OHyYLcwQD4Kcm)`LLwMh4WT~p29f7M!iafJSU`IV}QY5Wa z(n44-9oA}?J{a+ah*@31WTs#&J#o1`H98#6IQf;Wv0N_!);f&9g7o-k(lW5rWnDUR zQBFIRG+X=6NnsI@mxnwm;tf5;_Uxg?jZ8m-m0}&6+DA!qam(p$mN5R})yA_7m$q@| zFEd|dpS595rxQr-n#GjI5i-AhnUE>Cr;jpCqSrD~EwK_DqI^7%3#p5)%T_od!t3SOmH9MyXeeGO2(UQL;ax|x?Ncixmeo1=$ z{-);Au{*tfzOG?KQ~K|ak8-HQ?`Pekhe2WM(8s{xv-p>Zmu_6{G!-oE$7$mY`MOJorI=+mMx?H;`pr!;fVYz?5~yXBACruWB`Ph zZM}90_<^OBxIhyZ9BW$`>6JvO;%VFpqVr8|7t3~AmxYak6?`Pp#c;**_SYmi`&z23 z`p6_~ePvH)C6x-G9$hgL=eVALq`-AiamN>!3~Lxw&{H(b{B(7xSRm6<3<{%{yXiH# zos5Rv1L+8fUKJLo%P>4I&$}yrh6lG8wTrPT|sWXY0kIR>+mRu5a+T}vyk zEXt#zabpNjnkl%!fO#2ccyutqxYIyF3zX2n5Ga!-m_VqTLU|;`1R76hSGEf_13x;M zK|i$fefQkGXTN*CbLWDXs6HuWW|OYzzKEC1Z;Oc>ASPPC=kXvBNKHyv*rekT0wJFV zVu_<419@$+M7}U4e7H#5KmsifDF+G(t|S0dAalD3NWr0*Mmjz@NcagnL~se5rX?<4hza@}VJ5!b zAc6|j_(+EE1o3#512*7(pUcNIii;PCNs5s;2sagsGm|T2ibANMs{E)L#t@IE-dk5| zDm9zcFl&P`Ef!HlVFThZmLss;3fCD;+#4)r7WLTG;$VEB_Lb0xw$wEkLq zrG<7#Wgas?S)JEu#A;C%tA!gm4px1{WW^#CT-K`13(!e;Ra=Bh(@!KmvWS$xh3}7&8 zHK_wnpim9#)JAB#R0D9X7J7}r@8G`IDYdZ`R@jPooP*WXBk@XClLNKJ5QH_VVA$%g zn^a~qT_Jb7>g+nBOx^%03t$}{fuyyihznIyA&o^}1re2jh{+x;(^iuP7ITMmUYkt` zP=#L)td;gE(ireyP>5;>I|y?f#l(026}PQB5fm35LD?YSL*z%prq| zbyn4vgq4)hR_?(unANIO_1ZE_rsQU;5i_jDVVJEl>m#s%!9l56O3T#xa6TQXCQC3^ ziAwD;%WXQy4-i?Y){FQtkIN^Gx)o%dGDPE1)U3}3l}46!GYT`TXLV&^SXx2&%YFG& zH5rBd8lX^<4nxpnVoapDUe4-FrGB*?k(n4<)MPhsuW?dL5G4%}LsT2`=2w&bErA-< zPiYgb!v?!?&_|q9Adl-sGS55Ef_YqmrbvQhaM}k7IXq7Lx#lCOU;y{`hqS~^;7mB) z{bDa?6azywoRx^VX6O1k;0wjQD->_`AQ3kgCquX-!$w}8&tW-SIPMl=y3W_{H$jqH zV{uz7=@y9be+**0qiq5{kIxqt?F<|NBa>d>EcMK*LV+ML0XU&lkdh>@36nDTDkC%o zyciEgWTXx;6lem-jAv6b(uZVotOOo_rh+N)AwkB(p+hiD`{Rbg@y}7gAS+WOg@6=D zAu0EiS7nN1N=RA&4TgaJfg}LP8z7PUEE1(b%I)(LIhFy>26m8S>`UsAWs>+F7MQP($# zi?>R&U{oBC#^e1*C=~FMmx0Ogc$9FQaLj4^`ujVh#tUbE)$y~NiQj))BjQ~36JCtBWmM`Sqha0YeT2?ypa>XM|kHoSksZa??>hOMu~zB_c@ zF4V5Xv@P^HWXGPi-maQHYx~Gi-Oe}He5xJ2?G4f8!#lS2)r{?%p1m^Io%8Z!bI7h= zQk1OydK&^>18H%gWWj*eW&``uIM(YtH(O7b_30*_YcsV%6D^hl{(i-dHwM9VJpP9(sGj#@1f2zTUL9@#4u)!|H@B#9jc>v_GsKu`!nTxSA4X+=Bw-Q zOS!^p6F1*I&n#E%+m-a~-aEMyPhWgn^t;1F+n3Ol%_o=qh(6HJe(28@P;v0H^)m`f z-|O6eY{SIX9e10X)9;>ZnbQ1V>B57vvLDz=xUBQ#JB`XzZ!xHtd8E zcoP7@2Z2iq6w80j+*$hD2gTl+-6sn-T|1I~@?yrd#qM-dkIwc*^RfxvPW`_w+~^$p z$&HJnIkP(P0>$nw4sNk@PM7q(SGni-x^?Nt{I7J6i%t6e&CAAB!JgIlHQLUs@_Z!Q z{K{u}P>hFgBAdhA4?x{>*~Y;Wb?8;3%?HLmx{9O-Aa3k`7Z@Ix^e9M4gwnV}u>cf- z0`3%4$_lDL{^L<0Bo^lM-CTXTZ*JGo=8jt(t=C86aMtajy=(uJHy`;gq-0&= literal 0 HcmV?d00001 diff --git a/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/TestAbility.ets b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/TestAbility.ets new file mode 100644 index 000000000..8d65dd2ea --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/TestAbility.ets @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2023 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 hilog from '@ohos.hilog'; +import Ability from '@ohos.app.ability.UIAbility' +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import testsuite from '../test/List.test' +import Window from '@ohos.window' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onCreate'); + hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? ''); + hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:'+ JSON.stringify(launchParam) ?? ''); + } + + onDestroy() { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onDestroy'); + } + + onWindowStageCreate(windowStage: Window.WindowStage) { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageCreate'); + windowStage.loadContent('TestAbility/pages/Index', (err, data) => { + if (err.code) { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.ERROR); + hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); + return; + } + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', + JSON.stringify(data) ?? ''); + }); + } + + onWindowStageDestroy() { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageDestroy'); + } + + onForeground() { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onForeground'); + } + + onBackground() { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onBackground'); + } +} diff --git a/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/Index.ets b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/Index.ets new file mode 100644 index 000000000..fa2844b59 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/Index.ets @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2023 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. + */ + //@ts-nocheck +import hilog from '@ohos.hilog'; +import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; +import { Hypium } from '@ohos/hypium'; +import testsuite from '../../test/List.test'; + +@Entry +@Component +struct Index { + aboutToAppear() { + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility index aboutToAppear'); + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!'); + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + @State message: string = 'Hello World' + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(20) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .width('35%') + .height('5%') + .onClick(()=>{ + }) + } + .width('100%') + } + .height('100%') + } + } \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/SwiperMargin.ets b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/SwiperMargin.ets new file mode 100644 index 000000000..09fd49bcb --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/SwiperMargin.ets @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2023 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. + */ +@Entry +@Component +struct SwiperMargin { + private swiperController: SwiperController = new SwiperController() + private swiperController2: SwiperController = new SwiperController() + private swiperController3: SwiperController = new SwiperController() + private swiperController4: SwiperController = new SwiperController() + private arr: number[] = Array.apply(this, {length: 6}).map((item, i) => (i+1)) + + build() { + Scroll() { + Column() { + Swiper(this.swiperController) { + ForEach(this.arr, (item: number) => { + Text('' + item) + .width('100%') + .height(50) + .backgroundColor(item % 2 == 0 ? 0xAFEEEE : Color.Green) + .textAlign(TextAlign.Center) + .fontSize(25) + }) + } + .cachedCount(2) + .index(0) + .autoPlay(true) + .interval(1000) + .indicator(true) + .loop(true) + .duration(500) + .prevMargin(-10) + .nextMargin(-10) + .vertical(false) + .displayCount(1) + .itemSpace(10) + .curve(Curve.Linear) + .key('SwiperMargin_Swiper1') + + Swiper(this.swiperController2) { + ForEach(this.arr, (item: number) => { + Text('' + item) + .width('100%') + .height(50) + .backgroundColor(item % 2 == 0 ? 0xAFEEEE : Color.Green) + .textAlign(TextAlign.Center) + .fontSize(30) + }) + } + .cachedCount(2) + .index(0) + .autoPlay(true) + .interval(1000) + .indicator(true) + .loop(false) + .duration(500) + .prevMargin(10) + .nextMargin(10) + .vertical(false) + .displayCount(1) + .itemSpace(10) + .curve(Curve.Linear) + .key('SwiperMargin_Swiper2') + + Swiper(this.swiperController3) { + ForEach(this.arr, (item: number) => { + Text('' + item) + .width('100%') + .height(50) + .backgroundColor(item % 2 == 0 ? 0xAFEEEE : Color.Green) + .textAlign(TextAlign.Center) + .fontSize(30) + }) + } + .cachedCount(2) + .index(0) + .autoPlay(false) + .interval(1000) + .indicator(true) + .loop(false) + .duration(500) + .prevMargin('11') + .nextMargin('11') + .vertical(false) + .displayCount(1) + .itemSpace(10) + .curve(Curve.Linear) + .key('SwiperMargin_Swiper3') + + Swiper(this.swiperController4) { + ForEach(this.arr, (item: number) => { + Text('' + item) + .width('100%') + .height(50) + .backgroundColor(item % 2 == 0 ? 0xAFEEEE : Color.Green) + .textAlign(TextAlign.Center) + .fontSize(30) + }) + } + .cachedCount(2) + .index(0) + .autoPlay(false) + .interval(1000) + .indicator(true) + .loop(true) + .duration(500) + .prevMargin($r('app.string.swiper_margin')) + .nextMargin($r('app.string.swiper_margin')) + .vertical(false) + .displayCount(1) + .itemSpace(10) + .curve(Curve.Linear) + .key('SwiperMargin_Swiper4') + + } + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_component_api_five/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 000000000..9e1abddd7 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2023 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 hilog from '@ohos.hilog'; +import TestRunner from '@ohos.application.testRunner' +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' + +var abilityDelegator = undefined +var abilityDelegatorArguments = undefined + +function translateParamsToString(parameters) { + const keySet = new Set([ + '-s class', '-s notClass', '-s suite', '-s it', + '-s level', '-s testType', '-s size', '-s timeout', + '-s dryRun' + ]); + let targetParams = ''; + for (const key in parameters) { + if (keySet.has(key)) { + targetParams = `${targetParams} ${key} ${parameters[key]}`; + } + } + return targetParams.trim(); +} + +async function onAbilityCreateCallback() { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback'); +} + +async function addAbilityMonitorCallback(err): Promise { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? ''); +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare '); + } + + async onRun() { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run'); + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments(); + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator(); + let testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility'; + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback); + let cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName; + cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters); + let debug = abilityDelegatorArguments.parameters['-D']; + if (debug == 'true') { + cmd += ' -D'; + } + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd); + abilityDelegator.executeShellCommand(cmd, + (err, d) => { + hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? ''); + hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.stdResult ?? ''); + hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.exitCode ?? ''); + }); + hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun end'); + } +} diff --git a/arkui/ace_ets_component_api_five/src/main/ets/test/List.test.ets b/arkui/ace_ets_component_api_five/src/main/ets/test/List.test.ets new file mode 100644 index 000000000..858998506 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/ets/test/List.test.ets @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2023 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 SwiperMarginTest from './SwiperMargin.test' + +export default function testsuite() { + SwiperMarginTest() +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/src/main/ets/test/SwiperMargin.test.ets b/arkui/ace_ets_component_api_five/src/main/ets/test/SwiperMargin.test.ets new file mode 100644 index 000000000..f09467c06 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/ets/test/SwiperMargin.test.ets @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2023 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, beforeEach, afterEach, it, expect } from '@ohos/hypium' +import router from '@ohos.router' +import {UiDriver, UiComponent, BY, Driver, Component, ON} from '@ohos.UiTest' +export default function SwiperMarginTest() { + + const SUITE = 'SwiperMargin' + const waitUiReadyMs = 500; + describe('SwiperMarginTest', function () { + + beforeEach(async function (done) { + let options = { + url: "TestAbility/pages/SwiperMargin", + } + try { + router.clear(); + let pages = router.getState(); + if (pages == null || !("SwiperMargin" == pages.name)) { + await router.pushUrl(options).then(()=>{ + console.info(`${SUITE} router.pushUrl success`); + }).catch(err => { + console.error(`${SUITE} router.pushUrl failed, code is ${err.code}, message is ${err.message}`); + }) + } + } catch (err) { + console.error(`${SUITE} beforeEach error:` + JSON.stringify(err)); + } + done() + }); + + /* + *tc.number ArkUI_Swiper_0100 + *tc.name Set Swiper's nextMargin and prevMargin with negative + *tc.desc Set Swiper's nextMargin and prevMargin with negative + */ + it('ArkUI_Swiper_0100', 0, async function (done) { + let CASE = 'ArkUI_Swiper_0100' + console.info(`${SUITE} ${CASE} START`); + + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + let baseKey = 'SwiperMargin_Swiper1' + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + + expect(obj.$attrs.prevMargin).assertEqual('0.00vp') + expect(obj.$attrs.nextMargin).assertEqual('0.00vp') + console.info(`${SUITE} ${CASE} END`); + + done(); + }); + + /* + *tc.number ArkUI_Swiper_0200 + *tc.name Set Swiper's nextMargin and prevMargin with positive + *tc.desc Set Swiper's nextMargin and prevMargin with positive + */ + it('ArkUI_Swiper_0200', 0, async function (done) { + let CASE = 'ArkUI_Swiper_0200' + console.info(`${SUITE} ${CASE} START`); + + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + let baseKey = 'SwiperMargin_Swiper2' + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + + expect(obj.$attrs.prevMargin).assertEqual('10.00vp') + expect(obj.$attrs.nextMargin).assertEqual('10.00vp') + console.info(`${SUITE} ${CASE} END`); + + done(); + }); + + /* + *tc.number ArkUI_Swiper_0300 + *tc.name Set Swiper's nextMargin and prevMargin with string + *tc.desc Set Swiper's nextMargin and prevMargin with string + */ + it('ArkUI_Swiper_0300', 0, async function (done) { + let CASE = 'ArkUI_Swiper_0300' + console.info(`${SUITE} ${CASE} START`); + + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + let baseKey = 'SwiperMargin_Swiper3' + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + + expect(obj.$attrs.prevMargin).assertEqual('11.00vp') + expect(obj.$attrs.nextMargin).assertEqual('11.00vp') + console.info(`${SUITE} ${CASE} END`); + done(); + }); + + /* + *tc.number ArkUI_Swiper_0400 + *tc.name Set Swiper's nextMargin and prevMargin with Resource + *tc.desc Set Swiper's nextMargin and prevMargin with Resource + */ + it('ArkUI_Swiper_0400', 0, async function (done) { + let CASE = 'ArkUI_Swiper_0400' + console.info(`${SUITE} ${CASE} START`); + + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + let baseKey = 'SwiperMargin_Swiper4' + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + + expect(obj.$attrs.prevMargin).assertEqual('12.00vp') + expect(obj.$attrs.nextMargin).assertEqual('12.00vp') + console.info(`${SUITE} ${CASE} END`); + done(); + }); + + + }) +} diff --git a/arkui/ace_ets_component_api_five/src/main/module.json b/arkui/ace_ets_component_api_five/src/main/module.json new file mode 100644 index 000000000..41203db25 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/module.json @@ -0,0 +1,41 @@ +{ + "module": { + "name": "entry_test", + "type": "feature", + "description": "$string:module_test_desc", + "mainElement": "TestAbility", + "deviceTypes": [ + "default", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:test_pages", + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "abilities": [ + { + "name": "TestAbility", + "srcEntrance": "./ets/TestAbility/TestAbility.ets", + "description": "$string:TestAbility_desc", + "icon": "$media:icon", + "label": "$string:TestAbility_label", + "visible": true, + "startWindowIcon": "$media:icon", + "startWindowBackground": "$color:start_window_background", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + } + ] + } +} diff --git a/arkui/ace_ets_component_api_five/src/main/resources/base/element/color.json b/arkui/ace_ets_component_api_five/src/main/resources/base/element/color.json new file mode 100644 index 000000000..17e37a02e --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/resources/base/element/color.json @@ -0,0 +1,20 @@ +{ + "color": [ + { + "name": "start_window_background", + "value": "#FFFFFF" + }, + { + "name": "Divider_color", + "value": "#000000" + }, + { + "name": "badge_BorderColor", + "value": "#FFFD0000" + }, + { + "name": "color_red", + "value": "#ffff0000" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/src/main/resources/base/element/string.json b/arkui/ace_ets_component_api_five/src/main/resources/base/element/string.json new file mode 100644 index 000000000..278a5d8b4 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/resources/base/element/string.json @@ -0,0 +1,40 @@ +{ + "string": [ + { + "name": "module_test_desc", + "value": "test ability description" + }, + { + "name": "TestAbility_desc", + "value": "the test ability" + }, + { + "name": "TestAbility_label", + "value": "test label" + }, + { + "name": "Divider_width", + "value": "10px" + }, + { + "name": "Divider_startMargin", + "value": "5px" + }, + { + "name": "Divider_endMargin", + "value": "5px" + }, + { + "name": "badge_Size_test", + "value": "7vp" + }, + { + "name": "swiper_margin", + "value": "12" + }, + { + "name": "test_title", + "value": "test_resource_title" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/src/main/resources/base/media/icon.png b/arkui/ace_ets_component_api_five/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 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