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 Binary files /dev/null and b/case/assert_res/test_dde_1271279_1.png differ diff --git a/case/test_dde_1271279.py b/case/test_dde_1271279.py new file mode 100644 index 0000000000000000000000000000000000000000..7d1911aebe79fd7265fa2d14f0305b8c7e41c0aa --- /dev/null +++ b/case/test_dde_1271279.py @@ -0,0 +1,86 @@ +import pytest + +from apps.dde_autotest_euler.case.base_case import BaseCase +from apps.dde_autotest_euler.method.dde_method import DdeMethod +from src import CmdCtl as Cmd +from src import Src +from src import sleep + + +class TestDdeFileManagerCase(BaseCase): + + @pytest.fixture(scope="function", autouse=True) + def setup_teardown_1271279(self): + """前置和后置""" + DdeMethod().dde_dock.click_dde_file_manager_by_attr() + sleep(3) + yield + Src.kill_process("deepin-editor") + Src.kill_process("dde-file-manager") + Src.kill_process("dde-desktop") + Cmd.run_cmd("rm -rf ~/Documents/*") + Cmd.run_cmd("rm -rf ~/Desktop/*") + + def test_dde_1271279_1(self): + """文件管理器——保存文件""" + # 1. 任意打开一个doc文档，点击另存为按钮，查看系统显示 + # 1. 系统会自动弹出保存 对话框 + # 备注：由于euler没有预装wps，在此使用txt文档代替，不影响测试点 + 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() + 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 262ea84c5d9c98476d8d7a57afe4598de03d8d41..6a8de43f0224a048a39cfb52a1b18d86304d8c60 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 b629648f4f2711693a3c8fb9a7c833f91b7f4cb0..3a6d5daa12cef1b6c1bfca790f4c4d755c0ae63d 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 970756dcbabd8736aac7b27cffdb3de04e8270c7..f4b486629aaf97664a2f2e3b8ea6718fb33543aa 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 Binary files /dev/null and b/method/image_res/dde_file_manager_dialog_drop_menu.png differ diff --git a/method/image_res/dde_file_manager_dialog_pop_replace.png b/method/image_res/dde_file_manager_dialog_pop_replace.png new file mode 100755 index 0000000000000000000000000000000000000000..407417b0634377862456f657ee190dc2e2ac8489 Binary files /dev/null and b/method/image_res/dde_file_manager_dialog_pop_replace.png differ diff --git a/method/vender/dde_file_manager_method.py b/method/vender/dde_file_manager_method.py index 739ee92adafaf4f612cb2334f22347ffcd236b1d..529246196f0dc2b90297c8b6d06948b5fc1b4a55 100644 --- a/method/vender/dde_file_manager_method.py +++ b/method/vender/dde_file_manager_method.py @@ -26,6 +26,10 @@ class DdeFileManagerMethod(BaseMethod): """文管侧边栏点击，文档目录""" self.click_dir_in_left_view_by_attr("文档") + def click_desktop_dir_in_left_view_by_attr(self): + """文管侧边栏点击，桌面目录""" + self.click_dir_in_left_view_by_attr("桌面") + def click_dir_in_left_view_by_attr(self, _dir): """点击文管的侧边栏目录""" try: @@ -71,18 +75,26 @@ class DdeFileManagerMethod(BaseMethod): """点击回收站右上方的清空按钮""" self.dog.element_click("EmptyTrashButton") - def click_empty_confirm_btn_by_img(self): + def click_empty_confirm_btn_by_image(self): """回收站清空按钮弹窗，点击确认""" self.click_by_img("trash_empty_confirm.png") - def click_empty_cancle_btn_by_img(self): + def click_empty_cancle_btn_by_image(self): """回收站清空按钮弹窗，点击取消""" self.click_by_img("trash_empty_cancle.png") - def click_empty_x_btn_by_img(self): + def click_empty_x_btn_by_image(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") + + def click_dialog_drop_menu_by_image(self): + """点击文件选择对话框的下拉菜单""" + self.click_by_img("dde_file_manager_dialog_drop_menu.png") + + def click_dialog_pop_replace_by_image(self): + """文件选择对话框, 弹窗的替换按钮""" + self.click_by_img("dde_file_manager_dialog_pop_replace.png")