From 57b97e779a0d8ad008ccaeea9a5037a14f44eec2 Mon Sep 17 00:00:00 2001 From: lixu Date: Mon, 18 Nov 2024 18:04:23 +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=96=87?= =?UTF-8?q?=E4=BB=B6=E9=80=89=E6=8B=A9=E5=AF=B9=E8=AF=9D=E6=A1=86=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 任意打开一个doc文档，点击另存为按钮，查看系统显示 2. 查看对话框默认显示 3. 在保存对话框中，点击新建文件夹按钮，查看系统提示 4. 在保存对话框中，选中一个文件夹，点击保存按钮，查看系统显示 5. 在保存对话框中，直接点击保存按钮，查看系统显示 6. 在保存对话框中，修改保存路径为：桌面，点击保存，查看系统显示 Signed-off-by: lixu --- case/assert_res/test_dde_1271279_1.png | Bin 0 -> 1690 bytes case/test_dde_1271279.py | 86 ++++++++++++++++++ case/test_dde_1271281.py | 10 +- case/test_dde_1271283.py | 2 +- dde.csv | 3 +- .../dde_file_manager_dialog_drop_menu.png | Bin 0 -> 617 bytes .../dde_file_manager_dialog_pop_replace.png | Bin 0 -> 953 bytes method/vender/dde_file_manager_method.py | 18 +++- 8 files changed, 109 insertions(+), 10 deletions(-) create mode 100755 case/assert_res/test_dde_1271279_1.png create mode 100644 case/test_dde_1271279.py create mode 100755 method/image_res/dde_file_manager_dialog_drop_menu.png create mode 100755 method/image_res/dde_file_manager_dialog_pop_replace.png diff --git a/case/assert_res/test_dde_1271279_1.png b/case/assert_res/test_dde_1271279_1.png new file mode 100755 index 0000000000000000000000000000000000000000..8a4fce033a749d047600651f845cad168feb0d27 GIT binary patch literal 1690 zcmV;L24(q)P)*W~!mR=Jz4=atX!cB&o z?4J&LFCJX4XZ<-E&6aRm9JLd%e(Vk>V={ooiG><=hjTWTNuDOmjLGboW+$SroGU9x z3bkwKcMYk z&ougbF?P4rq8z@yM*6Zb44_2IJ4fx16S6pTiR9VRbWR9!LZoqC851)BwuLf8%@8$W zpvm4o8>#K2umKvlaE$3A@b68+Ie>QqadT$Naq@Kls|Pbb6yV7|jPWPtbJDKSu!haq zY%DcTDNIFQPm+ECaC5@hiS&F%4nW%hu=gxG=G&^sF}->^vpWK3Ir=u{?xC&2CR;{b z6L~re9RPBH{UxLnv2O{R_H*zuz=xxGEev33I=|LR`$E(t%rfzGx|ttKS@aa2ou{>v z=nzg+NMZpY11UJq_(5p(BpoL0nysV)y{XgRQKyPa+d0!rpo?TJsli1-n3CLj%iA5( zYy0yAr~u->r=r#lSs}1BlC1!gUdO|Qi&cDA1#tBi`8qxxNBm@V9VdDMpV&OBzMGy{~j zNYisI=vx@(?Vw(7jG;tJf$52Qbr?}Y0n&aUP$F? zFY;R*`M(oAfd#3Ys+QKn9wqS=bBD!^BxI8?3sEHT5J&zrnzS8=BEWa$(Ib#wx*rUJ3y~<;uZ%jQfn6jVJ^%Uc$qf_D-Vq($HqNG)DW- z+$MH;>_A@a< zMGYzstJYvI1Q~@@RtXmR)vOAZX9EmWa$pYb3bs7M*!}=(aya>Wm(rT_1gEb^<3Jap zLdZR5(gc}7*G73Oogza#QMw|6K?Ha+fTDTqU4oZ8al44iW7!E7rs1L>C59{UY#!OA zeD0#~CJHBJ`&hP4)bK~WvH7?kmY-kAB?PEg8O*3h$ctfwFF^JMl1_FtEqyDc<!c^M+@Gj1G`0a4I{8yi z=RK|(TP#N@Z{>IyalvHnvtW%F$$`_h>ayCe3NpT$$*d=(saDUhWU8BN`7(o>%+>{U zFH{1xo%U%D3p4wX5zDwFPB)vZNA)Lp9zolvu>Qc26ZXDEg9up_gbl#YlTML{uPLpz zNVE!@Zy^&j|Fge%%NjA%a ~/Documents/test1.txt") + euler = DdeMethod() + euler.dde_file_manager.click_document_dir_in_left_view_by_attr() + sleep(3) + euler.dde_file_manager.double_click_file_in_right_view_by_attr("test1.txt") + sleep(3) + Src.ctrl_shift_s() + self.assert_ocr_exist("保存") + # 2. 查看对话框默认显示 + # 2. 文件类型下拉按钮做“蓝白”反色； + euler.dde_file_manager.click_dialog_drop_menu_by_image() + self.assert_image_exist_in_dde("test_dde_1271279_1.png") + # 3. 在保存对话框中，点击新建文件夹按钮，查看系统提示 + # 3. 系统会自动新建一个文件夹 + Src.click(540, 300) + Src.right_click() + euler.dde_file_manager.click(*euler.ocr("新建文件夹")) + Src.double_click(540, 300) + self.assert_file_exist("~/Documents/新建文件夹") + # 4. 在保存对话框中，选中一个文件夹，点击保存按钮，查看系统显示 + # 4. 该文件会自动保存到该文件夹下 + sleep(3) + euler.dde_file_manager.double_click(*euler.ocr("新建文件夹")) + sleep(3) + euler.dde_file_manager.click(*euler.ocr("保存")) + self.assert_file_exist("~/Documents/新建文件夹/test1.txt") + + def test_dde_1271279_2(self): + """文件管理器——保存文件""" + # 5. 在保存对话框中，直接点击保存按钮，查看系统显示 + # 5. 该文件会自动保存到默认打开的路径文件夹中 + Cmd.run_cmd("echo hello > ~/Documents/test1.txt") + euler = DdeMethod() + euler.dde_file_manager.click_document_dir_in_left_view_by_attr() + sleep(3) + euler.dde_file_manager.double_click_file_in_right_view_by_attr("test1.txt") + sleep(3) + Src.ctrl_shift_s() + sleep(3) + euler.dde_file_manager.click(*euler.ocr("保存")) + euler.dde_file_manager.click_dialog_pop_replace_by_image() + self.assert_file_exist("~/Documents/test1.txt") + + def test_dde_1271279_3(self): + """文件管理器——保存文件""" + # 6. 在保存对话框中，修改保存路径为：桌面，点击保存，查看系统显示 + # 6. 文件会自动保存在桌面 + Cmd.run_cmd("echo hello > ~/Documents/test1.txt") + euler = DdeMethod() + euler.dde_file_manager.click_document_dir_in_left_view_by_attr() + sleep(3) + euler.dde_file_manager.double_click_file_in_right_view_by_attr("test1.txt") + sleep(3) + Src.ctrl_shift_s() + sleep(3) + euler.dde_file_manager.click_desktop_dir_in_left_view_by_attr() + euler.dde_file_manager.click(*euler.ocr("保存")) + self.assert_file_exist("~/Desktop/test1.txt") \ No newline at end of file diff --git a/case/test_dde_1271281.py b/case/test_dde_1271281.py index 262ea84..6a8de43 100644 --- a/case/test_dde_1271281.py +++ b/case/test_dde_1271281.py @@ -16,7 +16,7 @@ class TestDdeFileManagerCase(BaseCase): yield Cmd.run_cmd("rm -rf ~/Documents/*") Cmd.run_cmd("rm -rf /home/uos/.local/share/Trash/files/*") - Src.kill_process("dde-file-manage") + Src.kill_process("dde-file-manager") @pytest.fixture(scope="function", autouse=False) def setup_teardown_1271281_5(self): @@ -59,7 +59,7 @@ class TestDdeFileManagerCase(BaseCase): self.assert_ocr_exist("您确定要清空回收站") # 5. 在系统弹出提示对话框后，点击确定按钮，查看系统显示 # 5. 系统会自动清空当前回收站中所有文件，清空回收站后上方的按钮会自动隐藏 - euler.dde_file_manager.click_empty_confirm_btn_by_img() + euler.dde_file_manager.click_empty_confirm_btn_by_image() sleep(1) self.assert_file_not_exist("/home/uos/.local/share/Trash/files/test1") self.assert_image_not_exist_in_dde("test_dde_1271281_1") @@ -84,9 +84,9 @@ class TestDdeFileManagerCase(BaseCase): euler.dde_file_manager.click_empty_btn_in_right_view_by_attr() sleep(3) if operate == 'cancle': - euler.dde_file_manager.click_empty_cancle_btn_by_img() + euler.dde_file_manager.click_empty_cancle_btn_by_image() elif operate == 'x': - euler.dde_file_manager.click_empty_x_btn_by_img() + euler.dde_file_manager.click_empty_x_btn_by_image() elif operate == 'esc': Src.esc() sleep(1) @@ -107,7 +107,7 @@ class TestDdeFileManagerCase(BaseCase): Src.down() Src.enter() sleep(1) - euler.dde_file_manager.click_empty_confirm_btn_by_img() + euler.dde_file_manager.click_empty_confirm_btn_by_image() sleep(1) self.assert_file_not_exist("/home/uos/.local/share/Trash/files/test1") diff --git a/case/test_dde_1271283.py b/case/test_dde_1271283.py index b629648..3a6d5da 100644 --- a/case/test_dde_1271283.py +++ b/case/test_dde_1271283.py @@ -16,7 +16,7 @@ class TestDdeFileManagerCase(BaseCase): yield Cmd.run_cmd("rm -rf ~/Documents/*") Cmd.run_cmd("rm -rf /home/uos/.local/share/Trash/files/*") - Src.kill_process("dde-file-manage") + Src.kill_process("dde-file-manager") def test_dde_1271283_1(self): """文件管理器——还原文件""" diff --git a/dde.csv b/dde.csv index 970756d..f4b4866 100644 --- a/dde.csv +++ b/dde.csv @@ -46,4 +46,5 @@ 1271331,,, 1271175,,, 1271283,,, -1271281,,, \ No newline at end of file +1271281,,, +1271279,,, \ No newline at end of file diff --git a/method/image_res/dde_file_manager_dialog_drop_menu.png b/method/image_res/dde_file_manager_dialog_drop_menu.png new file mode 100755 index 0000000000000000000000000000000000000000..b38b05f31a828ef45a1869a1fa110d2828fe84a1 GIT binary patch literal 617 zcmV-v0+#)WP)`toJ=N#1vJLEZUF!a3sVXU0EGoh9xNDR4v$ZW=&w~GIy^p^|67y?3zt{d z`v*s@cIQtKMAT|`_79FOude6pkOvDZ%S(@U?w@}B{_N%ZB)JhmTJOE?eExF2yH#IV zUYfH*9xMPr?e?ul+xNbm{doRrDuRgi+8;iho;MqJH`mwZFK4}8FO{5WaMAts~ z^|gl&?zG>0vZT)u~A!XHtJG{ zW@8}*mb~?Xg-CP0=mF=j7c7e_u;kOi|58{0C@feC3*hce{0yyiVF9$(p65Az6Au7M zk_aK3?gb(;#wewnwh+g$Qc6nc*0gp85m^PLQV9{=vY@rL!+Sfqmr_b80l>3ETNhxA zF~&U43xYsODTEM0OiP2oAlq5kx{p6js=sh{}wT zZd7!kH*ZvCp+#j21=fQV-Lxo*!Y)QnSua6_iXmxKR#dpFYiqUY%GxpPjkNWpW*-U=P>6S#_e{42DPwi8_*aO93ez)4;s;7PTI&003B=fx3L7inq2Mxgr});bPV=F@6bf4=W0B)%Va> zm*>b;z}R-WP)J`%Z+JlO`ZK+%vy>lGhInKWYX2NA@NL;Iq|EGnww){C-_`a_upAH! zEC)me83W7t*5?SRX@AT39|q;;=d0}@8hS=0bT7y>zHMTHe*c`69h#c!?vVvoAZcHue4_P)U0o;<32aW-t7=)Edd~m zBmw}|8-VnoP8)-UX=!Ou+e7r&ow=PE+oXw8l!~#rDYoiLTR~~K%zFDG`qmD?fG}^l z<*Kv)cf8pr1Bnxc-0l!S>;6;0QeI+V!@7_|a=ar#)3J7kxuM4VqFS7qDjmN8vTVEH zMDF)u`kK!9%K<>@(DihEqe_(gB-32RxAfATc{xa7a$ zbV#5+zu{*NL{zXXDWbwk0xNa{FsRFCd3cj=`QY7A5Q?|{*qAf?{9$2HR_ENM;fH;S zp!@$9fB%{|JuPS-qf~Srm$9k-$I{GjSxoKI*s4py!Yuup`kur|z6C2}gRyst_j)XM z$~%{31;Wl76hU`>1BMV_7`09ONvJ;n4UB&)JoxYO`{&T|qZ=(hx}o*{OrsZV{n3q< bAKm-}W8h3frx7