From 98620f9082af8312edd58c6d5f44be6edfde0aab Mon Sep 17 00:00:00 2001 From: lixu Date: Mon, 18 Nov 2024 16:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E4=BE=8B=EF=BC=8C?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E5=99=A8=EF=BC=8C=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E5=9B=9E=E6=94=B6=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 在回收站内没有任何文件时,查看页面显示 2. 在回收站内有文件时,查看页面显示 3. 回收站上方出现按钮后,将鼠标悬停在该按钮上查看系统显示 4. 回收站上方出现按钮后,点击清空回收站按钮,查看系统显示 5. 在系统弹出提示对话框后,点击确定按钮,查看系统显示 6. 在系统弹出提示对话框后,点击取消按钮,查看系统显示 7. 在系统弹出提示对话框后,点击对话框右上角的×按钮,查看系统显示 8. 在系统弹出提示对话框后,按ESC键,查看系统显示 9. 在桌面选中回收站,右键-清空回收站,查看回收站显示 10. 在任务栏上选中回收站,右键-清空回收站,查看回收站显示 Signed-off-by: lixu --- case/assert_res/test_dde_1271281_1.png | Bin 0 -> 814 bytes case/test_dde_1271281.py | 131 ++++++++++++++++++++ dde.csv | 3 +- method/base_method.py | 4 + method/image_res/desktop_trash.png | Bin 0 -> 1122 bytes method/image_res/desktop_trash_no_empty.png | Bin 0 -> 1250 bytes method/image_res/trash_empty_cancle.png | Bin 0 -> 814 bytes method/image_res/trash_empty_confirm.png | Bin 0 -> 855 bytes method/image_res/trash_empty_x.png | Bin 0 -> 1029 bytes method/vender/dde_dock_method.py | 4 + method/vender/dde_file_manager_method.py | 22 +++- 11 files changed, 162 insertions(+), 2 deletions(-) create mode 100755 case/assert_res/test_dde_1271281_1.png create mode 100644 case/test_dde_1271281.py create mode 100755 method/image_res/desktop_trash.png create mode 100755 method/image_res/desktop_trash_no_empty.png create mode 100755 method/image_res/trash_empty_cancle.png create mode 100755 method/image_res/trash_empty_confirm.png create mode 100755 method/image_res/trash_empty_x.png diff --git a/case/assert_res/test_dde_1271281_1.png b/case/assert_res/test_dde_1271281_1.png new file mode 100755 index 0000000000000000000000000000000000000000..5565bbb7ccd7a89d3d69dddf762fd9ecb6464cbe GIT binary patch literal 814 zcmV+}1JV46P)0015c0ssI2>u+@V00009a7bBm000ie z000ie0hKEb8vp&5QHTlziFycvq=bw>i|j>_9;BD7Kv1keHufXk6r0_3W_D)hP7fo) zVkB92SzPw_bnm(6oH_q{&s>HY}b%kXqsjaLfI}OvoMBXWV?pUlH*+p z0J-0#xqpVauQ1=G>%=wonw^hWQ(GuddaM19-WYG{>$T5*CR@WQ7=pQwu2WLNbGKco zZ?sL00|2Bnq)KJiTTF-fYxl9;L8-~K7$m$KQOmbl2F%%jBDwD<91asq2LSxkCw22S zE;tJSY&61;JQL4#004FfN@Wc<7joZeTO)koN^iR0|A*um(lL=z70Fiz81su!0HDMr zz&f)S1pwVuWO+t<22n~ACdQ@O{Xo->sgJVHk2za;$0>sKn2=Ox4}5X;_eh7E*>HfJ zodf_#X(*)%qt8tTN?w+Iex<(2F*E5J?pL?(g1rZjrm^$kf>)2FLnq?RZF*rb!IFS@ zmvZ561*1cY=P%gdtiOcl zJFTkx+d=Vct2te2xhhxh2E#xY7r%I98o6l1bGvm_AU`%>jTbKWB)3!$tcs*UDk*DK zetGAfbR(UJc{?v)p(xRC3;;B@cdoNchMe=v)O5Rk;peVB6U;hUAyVS&BGL?C~ sWPgt{OLtqaeOBBnsn%-&X7!cY<&YvP|1Stc^G~XDo95K9shPyR z;Eduvs}=zWICg4{Z&PM*N(oU}Piy9S6OYG_jM3}yeXxj7q32k>Upad<@cpW3oDyPl zy5-WXFG7gxaKkGAz;YSA|M2O0e0MdvIT>^T08u4U&V%KjAFtvh3B#2Ta?5fZPBP(n z^K0>`QpBs#*F*>aP)gn1Pfi9$8laT=aB+EeKjEC^2_$JHs1DY1m|2<0bhcV;^mfoc zIzJm)mZeXUME1J}dh0qCWTQ-VwjGO^t@H3W(}Z@@?;f@oq0L53BigOHZ8OMv zCJ)(hEkF=bNhPIJ$NhuZ%)PmNWDL(=pCUjIhW%cr-|cMiQpxuh|NL}%T&x9E`4SJl8&GHTLF$MA3TtzloFSbZ%LUWVI)GPH|g7KAp}1(*0_+ z8Q)DnJIRF9s-;e=seLTM$gvq1-JJ~*0RZqEu2eoU&4#a(N`&0GG!??>uuIbx$2bw5 zV`-OZ^J`AYx5EzGUy)n54WADF|&CPEEcX~caJ)hQP**MN9~fwwYIeSI%SoT z)oRtJ^8i40nvHKyb0rZGlv0$^ey@Xw7k^**wd!;lFh<+WIshPGrIhz?T75m27H92N zc^)+HA18#8FW0w1$V5mXBx9`K>wF&FE|#nHCb4a9ac*&5DVKhEGqkd~%8i=E?Y7Ia zpeBTPnlDToBCI#@$IB5ZK9&96LAO%@AcR{e;;qDjQUGvlHaw~+h0ADFFsc;5?%mgF z*58~Rx;6&@M5Rp?lx~ljbq^6Jp^ZlM>1iRPLRw8f5`YjufWm8PNN9Mj%SU5c_iLuh;h_64d3yb7c-ZlWUB6tckB)-;{`Q@jQ$!&8 zI!6qa@jTdsQJhEx0Gu%bqT*SDUW1UGLCY5}SOhSUgb=^t_?7%Y|IRW2`Rs!+5+?N7 oM}Pm&bh+D7FG2U;+V8CY0Mug68mucSaR2}S07*qoM6N<$f`kVcRsaA1 literal 0 HcmV?d00001 diff --git a/method/image_res/desktop_trash_no_empty.png b/method/image_res/desktop_trash_no_empty.png new file mode 100755 index 0000000000000000000000000000000000000000..1a559dec28cf64182cba989207c52b335666b973 GIT binary patch literal 1250 zcmV<81ReW{P)R?sZR^>Y#4K0M*%ZZl@6Tzvun{u}NV6@Yg#B!Yg6*%2ZS z5K5_|r}io(Gj{6mPhTh{h0yXM(Fe+Enj2r76fF({NlDkZ?-!+CPzpf^3~sW>~S31pRQ}#tQ(mnbqftM zl&t}(wq{Xbp_!ZVaN?3;d5g%LX1099ibZQ@Rn&OnSrzlDD;L;~b?oQ;)iZ17R5esp z%&oX@W@UNRXM1<0Gbv9dl|7p51whvadjWFXZ7Vn>P8W#0n~?yY~nHg3vVM;veTf{_5@Q zT4B-4+uk&d5P@=f!*LS~+0y!9yyuMPBBJLvzFIc@es3BwV!5iJTxp#=+wOG_Glqr- zemK5QN=GS|!2n#DWJmyw4eJC^?sM_M&Ncwv#<~^`TyCJJH_l*Y<+ah-c-PR#pkgJJ zqgblkO_*9dqqb(LA9d~e6+;i3MkHk9n?}9>K!B#{g0!O86aWk`_~EJrJGQ>=I99d< zB?V~&x-rxbVCCZGa44MJprlk}+m2J#H37ghBc>4!g(52!ul0&CH2u-#>q$__|-Sw34pfRN>a6sz*GsvwR?Z(g~vupkzU6{OSU{*!k?0i@H( zc+Z*Pk-rSX)HUPY(u$&3$?mV;>%R1B>9lgw2rZnqVt(}_W1)vVgd_6AiAq)jLoU4lhXAct+7PX z1sICic5EsC{SS8B%?0UR7ZO0O>)N&@rTk|YGY4LyJBY#%wj&u3q0015c0ssI2>u+@V00009a7bBm000ie z000ie0hKEb8vp&5QHTlziFycvq=bw>i|j>_9;BD7Kv1keHufXk6r0_3W_D)hP7fo) zVkB92SzPw_bnm(6oH_q{&s>HY}b%kXqsjaLfI}OvoMBXWV?pUlH*+p z0J-0#xqpVauQ1=G>%=wonw^hWQ(GuddaM19-WYG{>$T5*CR@WQ7=pQwu2WLNbGKco zZ?sL00|2Bnq)KJiTTF-fYxl9;L8-~K7$m$KQOmbl2F%%jBDwD<91asq2LSxkCw22S zE;tJSY&61;JQL4#004FfN@Wc<7joZeTO)koN^iR0|A*um(lL=z70Fiz81su!0HDMr zz&f)S1pwVuWO+t<22n~ACdQ@O{Xo->sgJVHk2za;$0>sKn2=Ox4}5X;_eh7E*>HfJ zodf_#X(*)%qt8tTN?w+Iex<(2F*E5J?pL?(g1rZjrm^$kf>)2FLnq?RZF*rb!IFS@ zmvZ561*1cY=P%gdtiOcl zJFTkx+d=Vct2te2xhhxh2E#xY7r%I98o6l1bGvm_AU`%>jTbKWB)3!$tcs*UDk*DK zetGAfbR(UJc{?v)p(xRC3;;B@cdoNchMe=v)O5Rk;peVB6U;hUAyVS&BGL?C~ sWPgt{OfrqVA!k+44ZWU zRyMm{KR3^>o)0a-K;h+%zurYIM!o$#h^Ca3rZJ?}0yYdn5D=C0_I5D!2Q5=$002Bk zuvAfZo18Fzv0t=1mXmp&;5m6LSuCc=tYh+BYDZ(HnrOADDPC!aP$;CehKB;vHV0Euo=J0#kGh8Y{#eCi4)+c#FIGM9>1I{piZ=&f4 zpYK_%5T4C@I>`IB#EzX*Pq*?A!C+8p4I2rfDbZ#xxOqu*b}tiL|mepVvQYRFX!d^T+v_me@UyaoUeLrJNnm_nMA8CbKJrY ztZa6^ALB}DIj;`@oG%8PD@{o-RNB8?Q)wE5kIe+j+D9M7TTaW#h+_VO zJ8P1i6L0c{u4hNww|laWT%oHEm6fY5_}GlnG*?r(JZolMT(;@l^Fr zx_m%gfm(vwo3;$W^AbXUu=-;EKj72N*+?Xw>-uMm=Uo>VHtPbzW?f+Xz^e<4Zq@~c h&APy_8Gi&p_znAX1kwu{BkceH002ovPDHLkV1hDDf(!rv literal 0 HcmV?d00001 diff --git a/method/image_res/trash_empty_x.png b/method/image_res/trash_empty_x.png new file mode 100755 index 0000000000000000000000000000000000000000..5edc0c43781bf9b5ed1f7b0dbbd9a68e8c03b176 GIT binary patch literal 1029 zcmV+g1p51lP)000^Y0ssI2zx=>y00009a7bBm000ie z000ie0hKEb8vpjVQ`e zds9SZ(Mzx_t)MJ=XP{A5L=^c)k%R1kT3cxpxTx%HrdC$lnvW=a?cVKf-u{@#%IJ@9 zyL7l8?jQG_^X2gU-7n{I&bgS?Y6T8-;jwLi!?$n&BMuiZ;&1^Y4i_-upc61jQr?%t z>HLfM>GRs!y7vIk(b;8dZUX>)sj=$8699PE(A3`E=^xL2fMDCez(CWkwOjJNTM{&? z)hkkZ9~ck__4!(a|wMqwdoWi3m#= zul{Vd%}h=#H<}`3lGe8GqQSxsO%{rx(o?h;hOt=A0D{O2_R!f)EnmMM0OD2h)VbP6 zPv34_lNPOr)R!8ip<-`kSGPSPT)J?+j;38Rrza2u?r_o+3Wnr8~~KV zWP5TlJY9B@+LTk^f7`x;U>JsN4+8_kK$qRIa?>FIh*!xOhEb1HUb}B2am-S8N*1|Ja zvNkM@i&fM%nw8P={`xzWk4CGN0Pyik>xvBr{O;FJAQCW1I`$ne4ip4bJ*dHPURY?* z;xye?TkDMqlQcwhqx}BD`8sdCt>v4kroJFmXR)>@hskztU*l=Flho$iLN+S!6^H~Z z6bcFtZVr`*F%0v3qA8LpIICZ_KszRWMBb4LZgqRM3rzB1QfV`Ylw<;dGTy9Um zo;8$CJL$I(uHCG>Z+erUQ3a#2M*;xMVzIF8flYdPdR#8I_bDb~pfiL24IYoj=cDt- zr9UXw#sOTw$ioGUIOrTza{Li)1|tp^Fyj0Kf^T1={ocfe00000NkvXXu0mjf^cwVz literal 0 HcmV?d00001 diff --git a/method/vender/dde_dock_method.py b/method/vender/dde_dock_method.py index 0de5e64..3332ad3 100644 --- a/method/vender/dde_dock_method.py +++ b/method/vender/dde_dock_method.py @@ -44,3 +44,7 @@ class DdeDockMethod(BaseMethod): def click_datetime_icon_by_attr(self): """在任务栏中通过元素点击右下角时间区域""" self.click_by_attr("Btn_datetime") + + def right_click_trash_icon_by_attr(self): + """在任务栏中通过元素点击右下角回收站""" + self.right_click_by_attr("Btn_trash") diff --git a/method/vender/dde_file_manager_method.py b/method/vender/dde_file_manager_method.py index 70d670d..739ee92 100644 --- a/method/vender/dde_file_manager_method.py +++ b/method/vender/dde_file_manager_method.py @@ -65,4 +65,24 @@ class DdeFileManagerMethod(BaseMethod): self.dog.find_element_by_attr(f"$//{file_name}").point() self.right_click() except: - raise ElementNotFound(file_name) \ No newline at end of file + raise ElementNotFound(file_name) + + def click_empty_btn_in_right_view_by_attr(self): + """点击回收站右上方的清空按钮""" + self.dog.element_click("EmptyTrashButton") + + def click_empty_confirm_btn_by_img(self): + """回收站清空按钮弹窗,点击确认""" + self.click_by_img("trash_empty_confirm.png") + + def click_empty_cancle_btn_by_img(self): + """回收站清空按钮弹窗,点击取消""" + self.click_by_img("trash_empty_cancle.png") + + def click_empty_x_btn_by_img(self): + """回收站清空按钮弹窗,点击x""" + self.click_by_img("trash_empty_cancle.png") + + def right_click_trash_in_desktop_by_image(self): + """桌面,右键回收站(有文件)""" + self.right_click_by_img("desktop_trash_no_empty.png") -- Gitee