From 267543d76784a155708ff206d9681c7d96519218 Mon Sep 17 00:00:00 2001 From: yanglifeng1217 Date: Tue, 6 Dec 2022 19:18:12 +0800 Subject: [PATCH] Signed-off-by: yanglifeng1217 --- .../signature/openharmony_sx.p7b | Bin 3443 -> 3519 bytes .../hap/signature/openharmony_sx.p7b | Bin 3437 -> 3502 bytes .../hap/signature/openharmony_sx.p7b | Bin 3437 -> 3505 bytes .../hap/src/main/config.json | 4 +- .../hap/src/main/js/test/QueryKVJsTest.js | 8 +- .../js/test/SingleKvStoreKVCallbackJsTest.js | 1 + .../hap/signature/openharmony_sx.p7b | Bin 3437 -> 3493 bytes .../test/SingleKvStoreCallbackJsunit.test.js | 2 + .../hap/signature/openharmony_sx.p7b | Bin 3437 -> 3504 bytes .../js/test/PreferencesHelperJsunit.test.js | 1 + .../main/js/test/StorageHelperJsunit.test.js | 1 + .../hap/signature/openharmony_sx.p7b | Bin 3437 -> 3503 bytes .../hap/src/main/config.json | 7 +- .../hap/src/main/js/test/List.test.js | 52 +++++----- .../js/test/RdbStoreDistributedJsunit.test.js | 97 +++++++++--------- .../js/test/RdbstoreEncryptionJsunit.test.js | 50 ++++----- .../src/main/js/test/RdbstoreQuery.test.js | 13 ++- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 6 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../signature/openharmony_sx.p7b | Bin 3443 -> 3502 bytes 21 files changed, 117 insertions(+), 129 deletions(-) diff --git a/distributeddatamgr/Pasteboardjsapitest/signature/openharmony_sx.p7b b/distributeddatamgr/Pasteboardjsapitest/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..51ed63f3c01ec94c0c343b3adac4cb15efdcc7c2 100644 GIT binary patch delta 1174 zcmZ8hPi)&%9448Yu0RFi&t*em&ENp(AIDAFW-z4pY{yQTm&EyF*IAHoV%Le|*op1* z)!9&_YU&Aus+pAVlz?%p>zo#AC zdg8!XKDhJZBa*4GV&#I!DFHtkwwXpn61 z4a-9|hd_q|@hS^jh!)7iZrw^VpbYiA2!V}gGKFhWG9zzgy#|#`qEZK^vCN2qkYgY$ zHaT%n=F)ycN)5C!tk$HoS07oZjBrMn(ijHz{!fEV9=eK@Z>gNQ(`Z9Rr~oaENgo-k zj~F>Hff#|xS4?G!4o}d3FvRJ*^bllEOv)9|$rn&bz^p#KadUwIUa@Zd$6JN1A=sR5 zN@G0!IrQXXjS3qqC{Hnf@pj!BN5bbu)vo9UYYb}@7)THY{XSPli4@RTj;8xu-I`9A z~r5V5l+e2DsgJbP!3X=@#76ga}R0kkVrjfv?C9CQrw_>?$ zyC!X>*HT&RbowIX8}Vwcl0tI6n?QVl$FX8^sAl^sbqlju$}GWdzodBm&IXNGfzB4w zgJx@2w<}3?1NS?5s?zT2h1Hz0&RJb2;SKVBtiRo&MP5+qme_E8F)4Cp0!Rf{vRi)h z;`jnnyzs!$;V*B_Zo8lT`tc|5 z?op)k9IQUXYbjpR8^Sc2%`J^RIWnit23ox~xCIgVpDacnns zYBxOuRj3jdL{%p3wDo|5geDN6ahfzuh#Mdd`~%}KI3P`ElRyF_(iRoL@qP9Az2EQq zmA-c`K3X=w?vgXV`0^gN_uEorA$qvGbaf`Rqmc-;1fHBCl^fR$&1nkDo{|iPA zcjI%h-PoTyi7kEPZ8-KTn$y)2uThsz1zR1?ganlYNwEJub>820kKQBQ(p67S?3k9%5?-42@c9a z+a^^pz=p!qMR6Smenn&J;~HDo?lkgaUBWGbG!{}arb8l1tH|mMOj8?DTOE5~)Y-b( ze%kIxxKC(&jKPqo2X~??QxV{RGqp15ee#HrjTrg^C}J#-`P_wJH+5VmHuQo27ByDa&<3 zB`{!VdXue@Onx@aAQ3Vugh5N>Ls;}xP!ZE^hT+F4*K6A)(k;=9A!cQcvH;3dSQA;q z=x(GZy;ja1flB!{gUA7Hm8n;j=h~!T{r3Lo}aj!P+eo{My`wAAf!7ml<-S`C0ax=;0^QUyrVRdf{RG%^)3qDRD^DG9N58H4&iJoQ*WUD?*Zn?Ucnv?dyz=}J=aUx$ejh$v+WUv- zyEa|g4NRBfSFl6bv^s{qtxG)_+rc71Jcwf#@52qF>A{g>)m$f&L?T8;$iziVH|%Yx zWy>bE6OJX4L_8WHkAIJz%l2iRlgyr>k7v8S%acNpqCjIy0S*s=!lwX#AT&+Kp%jr% z8&%#_amL$oM3>n|pv!`AiGgiI2{Ld2t=1gs92WfsC$b3jUiSUQ7+g!6)6@$Hkw%d(f_^_^bl`>my*Ncp2Se$c!paOsZaeC5WV8{_p-k(!w zP&^5dE0ma;PSYR_6~%-KlY&Bn1}+exGI34-28hWzF!l%_Acmp=>$!)N!gynic?u^P z)N}|C1tJPSY>7ewT}D~DQ@2`nRgI6`P_mP_z&lsycX() z*^{){mx0GGNDa-xcCKKOrWuah+&*1DgJI9U_fuf!%o4<>zNcrw)xqk&>ppvTH8_cc zBX}%~li_fziihsEez&ws1Z8)nsD$k--S5vczr6U#L qc$9a3{_OUhH@^Aq?hCKI|4`|V+Y4{4A1|h_-rV4&*4M+je&;W{0gW60 delta 1164 zcmY+EO^D-U7{|Ar&a5L-MFl}U%-B5$&R5d(b3xblP0}QtN!qkYzo;-tnl^3Pq?0Cn z+o%+J7z9BWdXWWnJuG-y7xW?svfczykVUPn9j1Zdi}ruhv)Y^5C8YZ zb9bJdVe@ErZT-a)_T*kPbTNEw9&H3tB^(Ojk7Lob^`jFuq_0H6q16l6e0A-iHFRwr zxfhv7{(LPq)}2w;wstLLpvNx9@I7n~i|w4tn%xRyd?%(1hr6xr$aT7^=PnD}>FFD< zZl>ZyI-W@5nVpzrySqx;)t$hfN+#neERCQ3O+;Ym8VNlb4?0ntFGw;`U8??>>Yr;p=<(tRk>VK%L!&$;_2@DW!Ts)# z&o`|GQ8Cm(%T(jZfSX1XI&-r$GJGZA)(1vk?a?9+60`ed2G5q|Qmz$%29#m|0TK_! z`R|L&L+%0pp}HJ%a6TrgNnGtV$ zDq{USV1!LZ5cb`hk_PMUJzCmKQ&q z`Z*itkW7L0@@j0Erx^-Vn^p%(s^MteoGTyNvPTf*O4@7FxwgW&B_9;vY-txW5VSKi z1Uv~70I|#EmaqbZb-HQgNIyGivwjWhPirPClyJR}XteG9ZFR^4#E|4MQ|1%dpqhdr zpc)9E2H=o{Zy%a4!!@meF=-=fno3M6gxjBbvOF>ll#*jk6rg0}eWveO&UiG;R;PNg zT;!(Xfx=Jhd>Qm0<~jn?w7dcfgoNGiV%4%zKZZq??d;1&Tca}DW=W%_g4{oF3l+;D zSo6@YW%Aipa^z@Pf3$cvvj2=`5BBtlG8p#ty}>j{Rlln#%Rnvuid_0Qv6{ZPN@DZS zmBn!5__6Qs-Z@lnw`1uQ;CN%Wj3jf2^SoF!wr*7K6{QAMst)t@gcW!<)`uw+VYd`-B De%poj diff --git a/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/signature/openharmony_sx.p7b b/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/signature/openharmony_sx.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..521f6ed25cdb26dc252b416e7aa33d4ec2e4ddf5 100644 GIT binary patch delta 1209 zcmZ8hOKcle6veKSk|t3LWkVv=VgwR6vBwiTjsq=vZ@#wkoQyqVXIz6A&rHVOH~x%g z;wi$Ck%CyE$O|M?H4#Fp5UNyQgFvug#i}e|g%Dy>fshd0mCpjkjwqkyJ@35x&bd$L z{=D@5a+Me@-khC#=72xAx9B_VKOQY!_n^1@K3{Z^n4g_{>45j?rviQ-F`7aD5Pip^ znahFE%;wdgt#^Ah6R%>Wr3W{IWS9sO!Ik^4YHA)#9@e`T;>p;?dYp`JtOT)Xttxw# z-VJU>*Ef=}#2Oht{9|o?yRBnh>9$Nf7(eTKewY_23aB9iI4KB>6bp9nT7p#_%8*kT zvy^h{1mm4Kvde5C(BME+Vqg_f0ukFUW0nSaXk-fzn1~{hPN^7A$-8N*LdN4L*Kk-z zrVE0wMMJowa)o}LV+WODvajc%R4TGod5BRSIVoXEqiNXwKMkrp>?y@;RpXj=r3Pt1 z1Ul;w15{@Qh?YGOh?WLfv8qf__XPbLL!7ZsxgdQaQWilYyNz;!!x+;SGdvBfoihH9 zHjybIs7{?yjw6U`uvuwTt79WIYzNnkJ>MRm9`o>mUS10n@rnzWmZelE$nTe$(+$%KFsGLuY2+}*J1F`mK% z=yOrv;$2=JG$Wb-#4@h#wWO3AO0*Q+T#t6BTDzeo`YF=sD#P7`vLV*>VqI}z8$n{C zPooW?2%(ti(0zdb?M@kI6wpb!(RR*O*c4{ccKu{Pd=4?74gdnNlba3$BaSfnf8L;h zI2j_JmzXl9X^?@2(S-)XLP4d03uI^voe97IIavW_ItB#9P&D8?_mDCeudO+q!ej=eW-JKWd{JZBry7K9{ua926clF`3N7p`o z`$^)=?1SEFxqT^c${*kf*8lhezdm<8_{!67-2H7i{7LWDk-hl+H%t9*AL_^Me&zr8 shj;co%8xJKC?4Or@Ln-HfBTUymP7uZ4&ch8H_jI1!teO?KhMAU7nC@SM*si- delta 1173 zcmY+EO^D-U7{|Ar&Wtlm6%_>aFk|;1IA2M>yP)g)CTWt+ByHNHUsRYRO`A4t(n*uP zZBz<941ypGy~u*P9u_?5E_x9JS#N?U$f90E1Vt~pqKCnQU^>gr>h=HrAD-XyJpA8V zPyhDR6q|)RD{If4Fehi>z-sXNEL``caxf6UAHl*aYey$cKwAn01Iw4N+49N*YvB4U zbQYS0{(3nw((GZ!GIve6uSKpz@I7n~i|ky;s@3#md?z9g2D{D9(6Kv;>nsYK$?2;v zZ6>3!R5YH#(>oEs)Dir~Q0ToI=zff^+dJ=LQv zS3!(7$y8kj8KPTdyG#|+6XS-d@mgC^1p+oDyICXgagC_f3FuL_Q9CfxmcX(m-*lsg z6EADwERsmjT3n4OaTHC0O2ceJQPFL+lXav+OLAkeQaRtL0VTswvZhH39hdP^nK+eT3(C%n`I*l^21UpM@@em|9M)t`pcS zaMcenX3TG`YxD0nRv-R`ieji6^jVEFDYNvHgo|uZ8ePXbatWLVXXvUAr6n z=*ITZmCfq4SEL``zoYzl`q>BHreAvT>t<8 diff --git a/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/config.json b/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/config.json index 4eb191549..e1b24342d 100644 --- a/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/config.json +++ b/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/config.json @@ -19,7 +19,7 @@ "srcPath":"", "deviceType": [ "default", - "phone" + "tablet" ], "distro": { "deliveryWithInstall": true, @@ -92,4 +92,4 @@ "srcPath": "TestRunner" } } -} \ No newline at end of file +} diff --git a/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/QueryKVJsTest.js b/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/QueryKVJsTest.js index e8dc8e2bc..d2fe2745f 100644 --- a/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/QueryKVJsTest.js +++ b/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/QueryKVJsTest.js @@ -1932,12 +1932,12 @@ describe('queryTest', function() { }) /** - * @tc.number: SUB_DDM_DKV_QUERY_SETSUGGESTINDEX_PROMISE_0200 + * @tc.number: SUB_DDM_DKV_QUERY_PREFIXKEY_PROMISE_0200 * @tc.desc: Test Js Api Query.SetSuggestIndex() testcase 002 * @tc.type: FUNC * @tc.name Test Js Api Query.SetSuggestIndex() testcase 002 */ - it('SUB_DDM_DKV_QUERY_SETSUGGESTINDEX_PROMISE_0200', 0, async function(done) { + it('SUB_DDM_DKV_QUERY_PREFIXKEY_PROMISE_0200', 0, async function(done) { var query = null; try { query = new ddm.Query(); @@ -1953,12 +1953,12 @@ describe('queryTest', function() { }) /** - * @tc.number: SUB_DDM_DKV_QUERY_SETSUGGESTINDEX_PROMISE_0300 + * @tc.number: SUB_DDM_DKV_QUERY_PREFIXKEY_PROMISE_0300 * @tc.desc: Test Js Api Query.SetSuggestIndex() testcase 003 * @tc.type: FUNC * @tc.name Test Js Api Query.SetSuggestIndex() testcase 003 */ - it('SUB_DDM_DKV_QUERY_SETSUGGESTINDEX_PROMISE_0300', 0, async function(done) { + it('SUB_DDM_DKV_QUERY_PREFIXKEY_PROMISE_0300', 0, async function(done) { var query = null; try { query = new ddm.Query(); diff --git a/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/SingleKvStoreKVCallbackJsTest.js b/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/SingleKvStoreKVCallbackJsTest.js index 6d3a19c1e..134cdf6f8 100644 --- a/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/SingleKvStoreKVCallbackJsTest.js +++ b/distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/SingleKvStoreKVCallbackJsTest.js @@ -2337,6 +2337,7 @@ describe('SingleKvStoreCallbackTest', function () { */ it('SUB_DDM_DKV_SINGLEKVSTORE_CLOSERESULT_CALLBACK_8200', 0, async function (done) { console.info('SingleKvStoreCloseResultSetCallbackTest004'); + try{ kvStore.closeResultSet("",(err, data) => { console.info('SingleKvStoreCloseResultSetCallbackTest004 close result finish') diff --git a/distributeddatamgr/kvStoretest/kvStorejstest/hap/signature/openharmony_sx.p7b b/distributeddatamgr/kvStoretest/kvStorejstest/hap/signature/openharmony_sx.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..cb7f395cfb818db99d5360d9095de4435bde85b8 100644 GIT binary patch delta 1197 zcmZ8hONb*?6g8Q2_w)}31Q#u6PYEq!PbV*xR66OQ8Q!aZl1fskd^$0Ll}hsRtx8f! zs#7fl0`{zIY|{&IA>%?^Dag3gts;oJ8${5BD1$O6ZbSvg>NJj@6{&n580)qJ8};oGBf12J+2Ryhld zr6xO;n1UlhVzNN8IdzWO7wF%Z#N$KShS3X=g$!&Zl2Tf>SUkTmCNOZ2D(U~xmSKw$ z(&n4emL+Ebs9kQ=>srS@D(fwr<8$?LhIJM$%sJ4qY9)QP;@+HOJ2}%?%PwY+GeY9g zxW_9}Faj~l({zt7>GR5B1qeilgg~aXTWeKnqTdLok}bc^2cfM-$h_W3o47kFVw+Di z#`zG{Ndv(3Gq|KDv<`@va=fQEj8wR-G=s8T>~K^fbubYRsg}Y7drj3wT?v76eH8}F zd4w`zvR7;RV7urT7V6}haox@mX4e!|rG>jHQ?u$Ay!TI8sR;V;8x2t&O8`$!WI`(EQDE*hdx`xGeHQNiQ@T ze2z>b9BbqhOFV>3YShoAX|t;|wq-3HD|ZKGQUNi!J?Mmc{Sed-!sFqtm`#LL5rcY3 zHwCkzj8mE*=HtF-M2X}5*)5N6)2JJ!SJeilw>44*M!)LhP3^Xw^yx;wqqb+Cd!F7< zwYEv@9T94~ZCKUH&PDwkK|FuwC(qu}0t8dn{>;19Tl;s+XYZ_eC#0VQAwQsk0kQ~u z4^zMF@e`g+|5@aVKdV=+B~Na=e75r5-ILgtzu$ZN(_h{Vy!Q3aM-Og-mBq`>fAZPB z=aSpQ1J=Dc)}EO>zVVgklgsaa_abrUNB1{^wzB#_zV*R}lPlYIUvgi4WctdMFg!gQ g!Ph^2^3lhxz47f2Tj}5K%{=$N-#Wd@EPZtL7gh3zKmY&$ delta 1175 zcmY+EPl)4W7{<4q&g_m%6%_>aFk|;1IRBESowf@)eqWL%=}gk5P5O@tlcZ_WrcF9& z(yxt5p@%^bgrOH%P}jqPr*&by2!gCPK@?meSW_S7P`Mwu8mC&SlMR1~R@CQwD?WW@qR+9o2Ie1@7eZ z&DYlV;zTN*Na5+Nm}R@$O3T%qz`vJF#`mxke)=~NwGDgN)JJ;H9_Y?I722QXDUt+g zybTZsL7StcVxcbkfQRk&v0--e1yQ5`k^#@~W6}pX*cQqV)FfaE`G&<8MMSr2R9O@c zXyg_&rtFoN>_n|(JYAyeJk%I~%QQLWMTvkt)ieyPkB?N#Y?qm`(Rk8QCA!O#^qCEe zd1d}tcw;JJG-3@+;JY*ux-=eiqBviWWTLWA{WH}+*SgT-#UUcaGZKbIIZEo%B_4tY z-65ZASaqUosQsp?#*+azjVN^HW@%*jO2Do6jh@=2MII!k56TRlEy=}fGXM=J#Q*{% z9**bd}zxaL6piVuSI8D3g;GmkcZQST}(sJ zO4AVVBuoIrE|y!w@(|YOhLt7#%(%t+RjfCunygU7^?ah z3W|WLBY^6FLlVAuXu>qtu=>Whg{;Y5Vq7NN-o%sTp>d!T9doPzB`xnVJ&lHyQO6er)GTpbIhA5txSM|O_}l$6>rEU;{QS2kK2mEJUq8Z{B*-hrDh zTMogRhkiAk%QTZiN6Yxb`FoMwXEnROqmPyTpr`NjCqb%u9ZgvTYW`c~@~y4q)WtOt zn}zm+5Mw5$&5tha&u^@4KK}nW&+o47OmS=vPhxQ*O{DAC?s>XbBX}&bf$lt`eT3hx z-3xzmee>wbdiClX@=rJJsDGY*@$vWRx8BAcTe%ec9ACd2SqeuOj1F%&dFt}o`X67q zM1S<^2aZ6FzN!C{dtW`y{dn)4wHIFrzi{ExgoeIb;(xdri$1mf^iBKjFCQM=J}O*) O_vTl_&wu^4`t!d6qKH8N diff --git a/distributeddatamgr/kvStoretest/kvStorejstest/hap/src/main/js/test/SingleKvStoreCallbackJsunit.test.js b/distributeddatamgr/kvStoretest/kvStorejstest/hap/src/main/js/test/SingleKvStoreCallbackJsunit.test.js index f6c767050..8bcfb355c 100644 --- a/distributeddatamgr/kvStoretest/kvStorejstest/hap/src/main/js/test/SingleKvStoreCallbackJsunit.test.js +++ b/distributeddatamgr/kvStoretest/kvStorejstest/hap/src/main/js/test/SingleKvStoreCallbackJsunit.test.js @@ -2263,6 +2263,8 @@ describe('singleKvStoreCallbackTest', function () { */ it('testSingleKvStoreCloseResultSet104', 0, async function (done) { console.info('SingleKvStoreCloseResultSetCallbackTest004'); + + kvStore.closeResultSet("",(err, data) => { if(err != undefined){ console.info(`SingleKvStoreCloseResultSetCallbackTest004 close result error, error is ${err}`) diff --git a/distributeddatamgr/preferencesjstest/hap/signature/openharmony_sx.p7b b/distributeddatamgr/preferencesjstest/hap/signature/openharmony_sx.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..97d82281cc2d8abcad06106255b783c7366f8b96 100644 GIT binary patch delta 1208 zcmZ8hO^n+_7$s?Tmu+_?Dsd`@wx$wdf3g#AyondJFk?G*lATQ)=g%S4;y8};;P=uBXAXPab1S%ImDoCJ8J#YXd#08|K7cPiH51fz?Qb7Uj$Y)8&03!G4a+kQ^t?vZoSqF{8W*}n$G0`A zjGTCx$gD!O#w$9LuJM8vb5nGl^mR(6`vJ(aIbi*lI zJ%2*3O(*Hj(9|kM_n@aUm=&3LPWQwu;6&VA(nMq<=Rn{928aVzv^Tesnf@SK?zD8+ zHU#MVXaNbWg494z3sl;*JQhq}4sEPhP0I-@s_TUJZLOi%nyG3|+i^9=^_!>c8-5Q> z%kC=1^y|=*7ZlZSi0wl{F$~Mo>g%WL=LzEa?Vm#13v&oe0@tSDrQXuN3qSo}DLf`4 zB-n}oilRUTY&`7$Vkkm{E*Pt&pm$e!MlGZzQ1;_^w_7|t-E*5e|4;{{slABj?w@C delta 1176 zcmZ9MO^D-U7{|Ar&a5*`5fugXFk|;1IA2M>yP)g)CTWt+ByHNHUsRYRO`A4t(n*uP zZBz<941ypGy~u*P9u__6zftdH(3V2M!15(*w!HGd8n`hF z-3`q`f4&?UY4)&VnLDQ3*CJOV_%61KMYbd;DjHAW>FtPVIXiO8(QMzJOeCU7EQO!^9Sd8!HEe1lt!E81d!7nho90P^07|qC z5DP(@rNm;PE_r~1?e>vwbn^v4AOVs9M{{Gs13B2{%MjE=VDR~d$rS}ewQFQq5cVnL z6jZwGmgww6sbpMDr0N`0X@E-uMh#DW=gb(`CK!h^dHFmm{ci8yIu) z{FC73RKO_2=qk^3Da3av-0wuP9xqC<%0l(dRqsOULYEVUh!D<6XbR;>u}hUW2<~-< zT&`i(V`W|GHw`74@VO~OqH{MxA>EUGZmqBPlrAN3AU?fUrgKb5DrTELs81>Q5Fmbk zod3Q^9AxkFA1I44`xj%PiU>s5R?nB&Fbe_;AFP&x5b*>6MX>K_u832VK#h`!p6bz- zt02akWU8)%4AHH!U8aiZiE+c!c&)9d0s)(n-K>%LxJFd#1oSA|sO_6+OJG@(Z@STg ziI=r-7D*&%Ew09tIEp4grD3+AsOYxZ$vV=3CAqO!sho0KRJJ9vPSFE-I9=FOtTHMua8^EoFwDpa?I&XTuB=0`*P7X#xju8(jMJ&O?xyPWGWM_ zP%5yKQD5f9R;~oP5OZvvZkTSK0esx*b+AfFt{uSw!?gD#y`_@rEu*NC6JF}=JNdF{ z#~9;L55R*rH%oV~IB>ifjwSNBP-NW05g`01l NemVT?*Kevn{R;^Qi5ma_ diff --git a/distributeddatamgr/preferencesjstest/hap/src/main/js/test/PreferencesHelperJsunit.test.js b/distributeddatamgr/preferencesjstest/hap/src/main/js/test/PreferencesHelperJsunit.test.js index c9a4f1aca..0f40ad002 100644 --- a/distributeddatamgr/preferencesjstest/hap/src/main/js/test/PreferencesHelperJsunit.test.js +++ b/distributeddatamgr/preferencesjstest/hap/src/main/js/test/PreferencesHelperJsunit.test.js @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/distributeddatamgr/preferencesjstest/hap/src/main/js/test/StorageHelperJsunit.test.js b/distributeddatamgr/preferencesjstest/hap/src/main/js/test/StorageHelperJsunit.test.js index a4a7ea095..be9d0ee4f 100644 --- a/distributeddatamgr/preferencesjstest/hap/src/main/js/test/StorageHelperJsunit.test.js +++ b/distributeddatamgr/preferencesjstest/hap/src/main/js/test/StorageHelperJsunit.test.js @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/signature/openharmony_sx.p7b b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/signature/openharmony_sx.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..4bb6d7690796dc26857e209e50b8ec06c50ae029 100644 GIT binary patch delta 1208 zcmZ8hON`r86m2q@Dbr5a0F{_l>fkOaF`dMAJ`)cbRqxr3oy@#R96L@Nf`sEZ&d0Iy zapJ^XM9N}>KuE2!sRWBzuxk+umasx>3R1g3ERa|uB!obfDkKmRPDYf^@}76zednC3 z`+na3VZ=do3eJvCW;Pdt4e~5vz z`TAjKzE0i2#`<8`vaLN!?dsS8Mn>=mj@^0=Yj)j-$$Ra=^#m19B@<*Kbqlj>XHRW7 z`T#p1k|`>_A0rd@{)k=9^>m9@2VL8mF5U>-o{0=i18vs;ZUzD)lLk48!u^Uil+2M` z$#`v?_0L?zV~-K&aDXVXu!(2^k58&rngJp-PGksdMB|iODJ3#WIqTHOL;@8$ZrW8C zSrCpH2=f{zk3=p#t(B;eF2Z7^ly<5!3yH|h2rC-Hz~299P~+iHEuA#$oH?$wAR|aX zPrLXOwb?0R6kh~lgg9!~)fMWUqkm(FGbXeLvgaZd33N_!s35qkv3l`{XMmHhTK~}| zu@wZhl~dYv1t|v2TBq66y2Q9C5`4J#`SaNS1LT3ib5%!*xk=-cut67*Xj z4o>@=h~gA5SdOOqT-91tF3STv17ODRVtFWM0hwqHX*-tBswKQRqRS}Bdjls|Hfp&> zQyhWuxWfxAUGesPw{Tx}#9f-07AD=YJsC@?GSw4SqNvTv`@7>KOE0xm5B3nmm-_0A zA(S926pTt+9;s!qYV`rrC>IgbIe4t}ju{}G2gDZ;3)%o65I?`^vM}lj%lY$$&sv7a zi$%6-F$_3@hB1H!n}&kM01qh8n7K=U1qxLIb~X+K#L^7leD{zxSih~kN@1Bn)q()g zfYbou1R61IBxgh}>DI`0(VR$5t|09@RHMMtpqwc7l+l!!QgXW1@x(4!Vc3CGwX&pG z*LPcZADk#7A>+z`P*6_F=f+kYMah0ES(b7d9-W%KXi7H`Nl2VY333jU8%Zu*@yB6S zyh)zmd(mDIiG^Wt@lGfbv77cVqH4}CGSE%c@mEhZMaLfK?V+O&9e?%Ip6M^5We>Wl zxp)$~v8`(65IeYositYWdVTM_eiOsq`t+C3!Nqle&jW{x$X0*r-y6U9cq=j^2@+2d zcsxa>DtPqy2e26;u+WavORj~!i+q;lzWMyeYu93BdUWAxOH+P-M29)7V&j)KUhuz` z$A_V{V2H!n;Lhfi>pyU7H;8u+pE|pD!S<7{??29+zV{XO<n1H$z3I>)hVe{pcht|N2 zdFWnf9{Tf@$XK;UJ;^|l-jc2warseFkI*w}l{!}s;> zLQYYkD{h(2P33CVRYj`7L4^jmL=h8C5aVzl>zbw*_*gdeZiTLB&Bshxr1~5|o!h{K zYn^-&+?)v*g&0lYxju#XK85?8NY>*;DPCQu-nr^sXnp8%!Uz$mh5(yy4)*zrq*?N7?%vb`;nta=h z?N7a&g|kQ^L1%F_rp!?^393!A3q@J8m0r$~_ASYc$IF$p+o5uu7VDHeP=K?AUC2Pt z$xsk*1WW+LES6is3J}(*rkNwW?4-kZHEb}g=?q`O)k31tv39rQAqNmm5QlV`OJx0O z5(ne72n&*-F+MT{}4qMW0qIBdShX#&DoUjj122K~HHd5_R%d=*oww<@Dt> z0-Fb}`zglsliO?Rlfh8>J>%2=1^VP{Jvzg&6rRLl@k~6^z;-Y4y&A$Jp-pu6Ddm0q zPW>$S(ao)cs~fe`SEV06xGVp0{Q0f#GOxdZt*t!b{~cdl3oQjhG)4tC?E-maedG5p zoVYQ5=^dLV#$Px7$-gZh=6^VQbN%@jgU?<1IH90#m$>gwBjLw4p15uO{L8xscMgg- P-@5(f=(AtHsr~dXaLtKS diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/config.json b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/config.json index ee87a58bb..81053ee05 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/config.json +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/config.json @@ -16,8 +16,9 @@ "package": "ohos.acts.relationalStorejstest", "name": ".entry", "deviceType": [ - "tablet", - "default" + "tablet", + "default", + "phone" ], "distro": { "deliveryWithInstall": true, @@ -91,4 +92,4 @@ "mainAbility": ".MainAbility", "srcPath": "" } -} +} \ No newline at end of file diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/List.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/List.test.js index d40679d59..84bcde52b 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/List.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/List.test.js @@ -12,35 +12,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// import rdbStoreBackupRestoreCallbackTest from './RdbstoreBackupRestoreCallbackJsunit.test.js' -// import rdbStoreBackupRestoreWithFAContextTest from './RdbstoreBackupRestoreWithFAContextJsunit.test.js' -// import rdbStoreDeleteTest from './RdbstoreDeleteJsunit.test.js' +import rdbStoreBackupRestoreCallbackTest from './RdbstoreBackupRestoreCallbackJsunit.test.js' +import rdbStoreBackupRestoreWithFAContextTest from './RdbstoreBackupRestoreWithFAContextJsunit.test.js' +import rdbStoreDeleteTest from './RdbstoreDeleteJsunit.test.js' import rdbStoreDistributedTest from './RdbStoreDistributedJsunit.test.js' -// import rdbstoreInsertTest from './RdbstoreInsertJsunit.test.js' -// import rdbStorePredicatesJoinTest from './RdbstorePredicatesJoinJsunit.test.js' -// import rdbPredicatesTest from './RdbstorePredicatesJsunit.test.js' -// import rdbStoreTest from './RdbstoreRdbstoreJsunit.test.js' +import rdbstoreInsertTest from './RdbstoreInsertJsunit.test.js' +import rdbStorePredicatesJoinTest from './RdbstorePredicatesJoinJsunit.test.js' +import rdbPredicatesTest from './RdbstorePredicatesJsunit.test.js' +import rdbStoreTest from './RdbstoreRdbstoreJsunit.test.js' import rdbResultSetTest from './RdbStoreResultSetJsunit.test.js' -// import rdbstoreStoreExcuteSqlTest from './RdbstoreStoreExcuteSqlJsunit.test.js' -// import rdbstoreTransactionTest from './RdbstoreTransactionJsunit.test.js' -// import rdbStoreUpdateTest from './RdbstoreUpdateJsunit.test.js' -// import rdbstoreQueryTest from './RdbstoreQuery.test.js' -// import rdbStoreEncryptionTest from './RdbstoreEncryptionJsunit.test.js' -// import rdbStorePredicatesComplexFiledTest from './RdbstorePredicatesComplexFiledJsunit.test.js' +import rdbstoreStoreExcuteSqlTest from './RdbstoreStoreExcuteSqlJsunit.test.js' +import rdbstoreTransactionTest from './RdbstoreTransactionJsunit.test.js' +import rdbStoreUpdateTest from './RdbstoreUpdateJsunit.test.js' +import rdbstoreQueryTest from './RdbstoreQuery.test.js' +import rdbStoreEncryptionTest from './RdbstoreEncryptionJsunit.test.js' +import rdbStorePredicatesComplexFiledTest from './RdbstorePredicatesComplexFiledJsunit.test.js' export default function testsuite() { - // rdbStoreBackupRestoreCallbackTest() - // rdbStoreBackupRestoreWithFAContextTest() - // rdbStoreDeleteTest() + rdbStoreBackupRestoreCallbackTest() + rdbStoreBackupRestoreWithFAContextTest() + rdbStoreDeleteTest() rdbStoreDistributedTest() - // rdbstoreInsertTest() - // rdbStorePredicatesJoinTest() - // rdbPredicatesTest() - // rdbStoreTest() + rdbstoreInsertTest() + rdbStorePredicatesJoinTest() + rdbPredicatesTest() + rdbStoreTest() rdbResultSetTest() - // rdbstoreStoreExcuteSqlTest() - // rdbstoreTransactionTest() - // rdbStoreUpdateTest() - // rdbstoreQueryTest() - // rdbStoreEncryptionTest() - // rdbStorePredicatesComplexFiledTest() + rdbstoreStoreExcuteSqlTest() + rdbstoreTransactionTest() + rdbStoreUpdateTest() + rdbstoreQueryTest() + rdbStoreEncryptionTest() + rdbStorePredicatesComplexFiledTest() } diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbStoreDistributedJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbStoreDistributedJsunit.test.js index 11c8580d0..13b05bad9 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbStoreDistributedJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbStoreDistributedJsunit.test.js @@ -13,19 +13,63 @@ * limitations under the License. */ -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'; import dataRdb from '@ohos.data.rdb'; import abilityFeatureAbility from '@ohos.ability.featureAbility'; let context = abilityFeatureAbility.getContext(); +var sqlStatement = "CREATE TABLE IF NOT EXISTS employee (" + +"id INTEGER PRIMARY KEY AUTOINCREMENT," + +"name TEXT NOT NULL," +"age INTEGER)" +sqlStatement = "CREATE TABLE IF NOT EXISTS product (" + +"id INTEGER PRIMARY KEY AUTOINCREMENT," + +"name TEXT NOT NULL," +"price REAL," + +"vendor INTEGER," +"describe TEXT)" const TAG = "[RDB_JSKITS_TEST_Distributed]" const STORE_NAME = "distributed_rdb.db" var rdbStore = undefined; +const config = { + "name": STORE_NAME, +} + +async function executeSql1() { + let sqlStatement = "CREATE TABLE IF NOT EXISTS employee (" + + "id INTEGER PRIMARY KEY AUTOINCREMENT," + + "name TEXT NOT NULL," + + "age INTEGER)" +try { + await rdbStore.executeSql(sqlStatement, null) + console.info(TAG + "create table employee success") +} catch (err) { + console.info(TAG + "create table employee failed") + expect(null).assertFail() +} +} + +async function executeSql2() { + let sqlStatement = "CREATE TABLE IF NOT EXISTS product (" + + "id INTEGER PRIMARY KEY AUTOINCREMENT," + + "name TEXT NOT NULL," + + "price REAL," + + "vendor INTEGER," + + "describe TEXT)" +try { + await rdbStore.executeSql(sqlStatement, null) + console.info(TAG + "create table product success") +} catch (err) { + console.info(TAG + "create table product failed") + expect(null).assertFail() +} +} export default function rdbStoreDistributedTest() { describe('rdbStoreDistributedTest', function () { beforeAll(async function () { console.info(TAG + 'beforeAll') + rdbStore = await dataRdb.getRdbStore(config, 1); + console.info(TAG + "create rdb store success") + await executeSql1() + await executeSql2() }) beforeEach(async function () { @@ -43,53 +87,6 @@ describe('rdbStoreDistributedTest', function () { console.info(TAG + "*************Unit Test Begin*************"); - /** - * @tc.name rdb open test - * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_001 - * @tc.desc rdb open test - */ - it('testRdbStoreDistributed0001', 0, async function (done) { - console.info(TAG + "************* testRdbStoreDistributed001 start *************"); - const config = { - "name": STORE_NAME, - } - try { - rdbStore = await dataRdb.getRdbStore(config, 1); - console.info(TAG + "create rdb store success") - expect(rdbStore).assertEqual(rdbStore) - let sqlStatement = "CREATE TABLE IF NOT EXISTS employee (" + - "id INTEGER PRIMARY KEY AUTOINCREMENT," + - "name TEXT NOT NULL," + - "age INTEGER)" - try { - await rdbStore.executeSql(sqlStatement, null) - console.info(TAG + "create table employee success") - } catch (err) { - console.info(TAG + "create table employee failed") - expect(null).assertFail() - } - - sqlStatement = "CREATE TABLE IF NOT EXISTS product (" + - "id INTEGER PRIMARY KEY AUTOINCREMENT," + - "name TEXT NOT NULL," + - "price REAL," + - "vendor INTEGER," + - "describe TEXT)" - try { - await rdbStore.executeSql(sqlStatement, null) - console.info(TAG + "create table product success") - } catch (err) { - console.info(TAG + "create table product failed") - expect(null).assertFail() - } - } catch (err) { - console.info(TAG + "create rdb store failed") - expect(null).assertFail() - } - done() - console.info(TAG + "************* testRdbStoreDistributed001 end *************"); - }) - /** * @tc.name set_distributed_table_none_table * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_002 @@ -163,7 +160,7 @@ describe('rdbStoreDistributedTest', function () { console.info(TAG + "insert one record success " + rowId) expect(1).assertEqual(rowId) } catch (err) { - console.info(TAG + "insert one record failed"); + console.info(TAG + "insert one record failed" + err); expect(null).assertFail(); } done() @@ -189,7 +186,7 @@ describe('rdbStoreDistributedTest', function () { console.info(TAG + "update one record success " + rowId) expect(1).assertEqual(rowId) } catch (err) { - console.info(TAG + "update one record failed"); + console.info(TAG + "update one record failed" + err); expect(null).assertFail(); } } catch (err) { diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreEncryptionJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreEncryptionJsunit.test.js index 77434e4d9..57338fe92 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreEncryptionJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreEncryptionJsunit.test.js @@ -94,7 +94,7 @@ describe('rdbEncryptTest', function () { console.info(TAG + 'afterAll') }) - console.log(TAG + "*************Unit Test Begin*************") + console.info(TAG + "*************Unit Test Begin*************") /** * @tc.name RDB encrypted test @@ -102,23 +102,15 @@ describe('rdbEncryptTest', function () { * @tc.desc RDB create encrypt db test */ it('RdbEncryptTest_0010', 0, async function (done) { - await console.log(TAG + "************* RdbEncryptTest_0010 start *************") + console.info(TAG + "************* RdbEncryptTest_0010 start *************") context = ability_featureAbility.getContext() - let storePromise = data_rdb.getRdbStore(context, STORE_CONFIG_ENCRYPT, 1); - storePromise.then(async (store) => { - try { - await console.log(TAG + "getRdbStore done: " + store); - } catch (err) { - expect(null).assertFail(); - } + data_rdb.getRdbStore(context, STORE_CONFIG_ENCRYPT, 1).then((store) => { + done() + expect(store != null).assertTrue(); }).catch((err) => { expect(null).assertFail(); }) - await storePromise - storePromise = null - - done() - await console.log(TAG + "************* RdbEncryptTest_0010 end *************") + console.info(TAG + "************* RdbEncryptTest_0010 end *************") }) /** @@ -127,23 +119,17 @@ describe('rdbEncryptTest', function () { * @tc.desc RDB create unencrypted db test */ it('RdbEncryptTest_0020', 0, async function (done) { - await console.log(TAG + "************* RdbEncryptTest_0020 start *************") + console.info(TAG + "************* RdbEncryptTest_0020 start *************") context = ability_featureAbility.getContext() let storePromise = data_rdb.getRdbStore(context, STORE_CONFIG_UNENCRYPT, 1); - storePromise.then(async (store) => { - try { - await console.log(TAG + "getRdbStore done: " + store); - } catch (err) { - expect(null).assertFail(); - } + storePromise.then((store) => { + expect(store != null).assertTrue(); + done() }).catch((err) => { expect(null).assertFail(); }) - await storePromise - storePromise = null - - done() - await console.log(TAG + "************* RdbEncryptTest_0020 end *************") + + console.info(TAG + "************* RdbEncryptTest_0020 end *************") }) @@ -153,14 +139,14 @@ describe('rdbEncryptTest', function () { * @tc.desc RDB Encrypt function test */ it('RdbEncryptTest_0030', 0, async function (done) { - await console.log(TAG + "************* RdbEncryptTest_0030 start *************") + console.info(TAG + "************* RdbEncryptTest_0030 start *************") context = ability_featureAbility.getContext() rdbStore = await CreatRdbStore(context, STORE_CONFIG_ENCRYPT) let predicates = new data_rdb.RdbPredicates("test") predicates.equalTo("name", "zhangsan") let resultSet = await rdbStore.query(predicates) try { - console.log(TAG + "After restore resultSet query done") + console.info(TAG + "After restore resultSet query done") expect(true).assertEqual(resultSet.goToFirstRow()) const id = resultSet.getLong(resultSet.getColumnIndex("id")) const name = resultSet.getString(resultSet.getColumnIndex("name")) @@ -174,7 +160,7 @@ describe('rdbEncryptTest', function () { resultSet = null rdbStore = null done() - await console.log(TAG + "************* RdbEncryptTest_0030 end *************") + console.info(TAG + "************* RdbEncryptTest_0030 end *************") }) /** @@ -183,7 +169,7 @@ describe('rdbEncryptTest', function () { * @tc.desc RDB Encrypt function test */ it('RdbEncryptTest_0040', 0, async function (done) { - await console.log(TAG + "************* RdbEncryptTest_0040 start *************") + console.info(TAG + "************* RdbEncryptTest_0040 start *************") context = ability_featureAbility.getContext() rdbStore = await CreatRdbStore(context, STORE_CONFIG_ENCRYPT) rdbStore = null @@ -191,9 +177,9 @@ describe('rdbEncryptTest', function () { expect(rdbStore).assertNull done() - await console.log(TAG + "************* RdbEncryptTest_0040 end *************") + console.info(TAG + "************* RdbEncryptTest_0040 end *************") }) - console.log(TAG + "*************Unit Test End*************") + console.info(TAG + "*************Unit Test End*************") } ) diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreQuery.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreQuery.test.js index e009cee59..e2e2461fa 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreQuery.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreQuery.test.js @@ -12,23 +12,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'; import dataRdb from '@ohos.data.rdb'; -import factory from '@ohos.data.distributedData' -import abilityFeatureAbility from '@ohos.ability.featureAbility' +import factory from '@ohos.data.distributedData'; +import abilityFeatureAbility from '@ohos.ability.featureAbility'; const TAG = "[RDB_JSKITS_TEST]" const CREATE_TABLE_TEST = "CREATE TABLE IF NOT EXISTS test (" + "id INTEGER PRIMARY KEY AUTOINCREMENT, " + "name TEXT NOT NULL, " + "age INTEGER, " + "salary REAL, " + "blobType BLOB)" -const DATABASE_DIR = "/data/storage/el2/database/entry/rdb/" const STORE_CONFIG = { name: "Query.db", } const TEST_BUNDLE_NAME="ohos.acts.relationalStorejstest" -var kvManager = null; -var kvStore = null; -var localDeviceId = null; +var kvManager = null +var kvStore = null +var localDeviceId = null var rdbStore let context = abilityFeatureAbility.getContext() diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts index 582953b77..02ecba3c3 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.app.ability.AbilityStage" +import AbilityStage from "@ohos.application.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/MainAbility/MainAbility.ts index fb807f8be..cc6fdc5ef 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.app.ability.UIAbility' +import Ability from '@ohos.application.Ability' import dataShare from '@ohos.data.dataShare' import rpc from "@ohos.rpc"; @@ -111,7 +111,7 @@ export default class MainAbility extends Ability { console.log("[ttt] [DataShareTest] <> MainAbility onWindowStageCreate") globalThis.abilityContext = this.context; let context = this.context; - dseConnectionId = context.connectServiceExtensionAbility(dseWant, dseConnect); + dseConnectionId = context.connectAbility(dseWant, dseConnect); globalThis.connectDataShareExtAbility = (async () => { console.log("[ttt] [DataShareTest] <> connectDataShareExtAbility begin"); await dataShare.createDataShareHelper(globalThis.abilityContext, dseUri, (err,data)=>{ @@ -122,7 +122,7 @@ export default class MainAbility extends Ability { console.info("[ttt] [DataShareTest] <> ----- 3 -----, err = " + err); console.info("[ttt] [DataShareTest] <> ----- 4 -----, JSON.stringify(err) = " + JSON.stringify(err)); }); - dseConnectionId = await context.connectServiceExtensionAbility(dseWant, dseConnect); + dseConnectionId = await context.connectAbility(dseWant, dseConnect); }) windowStage.setUIContent(this.context, "MainAbility/pages/index", null) } diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/TestAbility/TestAbility.ts b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/TestAbility/TestAbility.ts index 8028a70f8..89a847305 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.app.ability.UIAbility' +import Ability from '@ohos.application.Ability' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/signature/openharmony_sx.p7b b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..2b4a5fbe0179c26ae219b7f8a6c372c23d777880 100644 GIT binary patch delta 1178 zcmYjRPly{;7;n;S*Im1`%AUGH>sU~Co88HuO_OyC``-M^Bzc)kCYxm96r3c(Br~%! z$;@P5vIQeS){6*BKo1^VPlAVDl!7AlqIeK2co4yxs3#FYR47QD?AF@b`+oes?|a|x zd%yR`rQ0iGa)im{DAwj-0d^etjvbG@!(M{RXaBesb6I=M~~*B-$wryaoYYlPbCMcZA^ce~AjKTGgO zJ?-f3@{zHA^zHVASrnwZnx(0pMoiC#jGRPM6lkS%fO!aXp5YtLphJT^)b)PHG=!2U z(!hWQ5vV-5p$dLof&%YANml(D$NuS zFi(2I4x&UdIb>-doz`^_MP`BukM~Dq6SMf_-US-MQj4n&B#s?5Ynj1Vli+Tn#`;Lo zaZW!W(KO7I6#H>nz=EwT^we6h)8?%GW*170+R&2gMGLVeX0V*iI}QH8ASocq{OqjQ zK|}+wMTmUlLCY?!*Zi^sms!=*-0q2 zN0C(*?WN8Atlh52%tP(k3>GN_#sJf^smo*uh}jJYf>rApKoHFYZs$Z11uF&)M^PRJ z#9bC*L?ftk^hqp2Bj!=MtwVrC9sxO+p2-6dU`jt#A<%$P?BHq9Dgd}4@)&X0XOmP+ z!-B7k1&|QZd7E`%V(9KQ1+&trlGY~n(ZIJ74LHi9LeniP_VpB#+UMDRVIwI6g8`1( z?$+7`DPNb`?phbuRC}~Gin}A&Y0`oUdkG=KiC!aBYEf%Os;1bzI;rzk>w2+LVZD@` zR_thW`dVZ)>U11$U2XZ^dRep7nQK%_@*P)`d{x&1m#IA~FpcfFd#W}4F7n(ZwPkt4 z)-6J{EC*}t=xO{iLEQZ4ugKQ?A|NNB8-cq?bE?j1)A!E9aV$=zVq`Ltj5WxOM;2d* z#E8h1XCfa|-uV7&aQWk_5AxoxUv}PqVSDFz@#3qwoZlbDA-Q<&iQx12=0@afIKq)k z_=>PXq@H^H%=X1kH-7wc`L{cB_n(h{HR3P)d~af{KDhr<_}Mc*?7Thy(_1^~Pww@i a@Uy3XQQrJq5$^o{MO`W0TuuzH{_`(GErzN9 delta 1092 zcmZ9LPl)4G0LCY?of&s^c7;Wenaf)B;*M?7X`NOa;k_hH(&=mZ+N5o2#ZA&Qnf^)A zCY@wDhf0wFFXB)a77y+m1VM&fRMwNAi+EG<;L*!^STDjNyP}|iomm;d`6C8lw?S1I;i&AV6RWtSZv+5d#o3&A!!Xi$#nX5Xb;=D5OUq2hBnS0!0Fyg4nQ8 z2?wmHFcplq*uXF9TxD41vb$O}Gc+W&j-bu~N@nR0VQC$9wT@-!J!(g@J7$HeSdFo* zNo*U@?1>D7Nd3PI*I=M=-L_IIxmqG=Vv-GbOD~`{8=yAWotcn?P?S(uozVi*2~it` zr>qSfguQ^qCnh;I$T3ozl@Sz9eq5w2lyBJ6FNsw`n*K;UHQr)C?_o$JHEf>D1odi4 zP-;0}OQcc)n+bd^MwRA(WDY_6-#g6Ii3s7gSBrv7hj0z9s;VLvPpK^PQh03=Nj zX^h=!s@3c$d?A_IA#3Y^S3@e%F2W`|W*jeD66%yu>xH5+Dsv4x7oe8MTe6%X*>qPR zrJ7Q=3q2E2p0hL54BQ8jLkWS*fYz~fzKmFo0aX)9nl;e38+O*0^Nu`RUoTfShAlSR zQU$*>0^*4pry*#iSqKmflVcF@$6b|35kiH{7X5HAw7LyjFG1|(nt@*L=Z6`mAXiKk zfqfth!bv-5r%QsYuI_z%+rjCQ!-C=Nti5h7VILk zxt$ob(sn1~x$20;ScsFgLg2RiGzLPzmxmxxHM*7UxYMvlpqnMrjIHGcqUeh@?xzA? zEOr?MCPiN!iArwvj_&va*3N~w5$9R)>3fmbn(p*sqHEZ^I_Np}ZcKIEm~VJ~bS(@SCeU(i;`19b0ONYkyZ@qh~_sP|{i$DGP_%Acb`?Zf#-^?H0kp8}Z_2$KU Z3m