diff --git a/case/assert_res/test_dde_1271055.png b/case/assert_res/test_dde_1271055.png deleted file mode 100644 index 268a773a11bd5760f915c5298d448a3c54dcc678..0000000000000000000000000000000000000000 Binary files a/case/assert_res/test_dde_1271055.png and /dev/null differ diff --git a/case/assert_res/test_dde_1271077.png b/case/assert_res/test_dde_1271077.png index 64751242df89b80aa339ae4f571bbfa20320af3d..d0348562aed84eae3d149a0fa4e7767eb84fbd02 100644 Binary files a/case/assert_res/test_dde_1271077.png and b/case/assert_res/test_dde_1271077.png differ diff --git a/case/test_dde_1271057.py b/case/test_dde_1271057.py new file mode 100644 index 0000000000000000000000000000000000000000..a488dea1cea74cbf68d6186b9a06c1c0530332b2 --- /dev/null +++ b/case/test_dde_1271057.py @@ -0,0 +1,38 @@ +from time import sleep +import pylinuxauto +import pytest +from nocmd import Cmd + +from case.base_case import BaseCase +from method.dde_method import DdeMethod + + +class TestDdeCase(BaseCase): + def test_dde_1271057(self, clear_file_in_home_and_kill_process): + """画板-ddf格式文件打开""" + euler = DdeMethod() + euler.dde_method_open_software_by_launcher("huaban") + sleep(5) + euler.deepin_draw_method_click_rectangle_tool_btn_by_attr() + pylinuxauto.mouse_down(500, 500) + pylinuxauto.drag_to(600, 600, 1, 1) + sleep(1) + pylinuxauto.ctrl_s() + sleep(1) + euler.dde_methode_click_save_btn_in_pop_window() + sleep(1) + DdeMethod().base_method_kill_process_by_cmd("deepin-draw") + sleep(2) + euler.dde_method_open_software_by_launcher("wenjianguanliqi") + euler.base_method_click_by_ocr("主目录") + euler.base_method_double_click_by_ocr("未命名") + sleep(5) + self.assert_process_status(True, "deepin-draw") + + @pytest.fixture + def clear_file_in_home_and_kill_process(self): + """清除测试文件，关闭进程""" + yield + DdeMethod().base_method_kill_process_by_cmd("deepin-draw") + DdeMethod().base_method_kill_process_by_cmd("dde-file-manager") + Cmd.run("rm ~/未命名.ddf") diff --git a/case/test_dde_1271321.py b/case/test_dde_1271321.py index 9a04417f9eac8a3a2b12b664c3cd1549d251ecfb..c7389164a9f619c2062a331dd46e9faffbab28a0 100644 --- a/case/test_dde_1271321.py +++ b/case/test_dde_1271321.py @@ -17,10 +17,10 @@ class TestDdeCase(BaseCase): euler.dde_dock_method_right_click_datetime_icon_by_attr() pylinuxauto.select_menu(1) sleep(1) - self.assert_ocr_exist("上午") + self.assert_ocr_exist("午") euler.dde_dock_method_right_click_datetime_icon_by_attr() pylinuxauto.select_menu(1) - self.assert_ocr_not_exist("上午") + self.assert_ocr_not_exist("午") sleep(1) euler.dde_dock_method_right_click_datetime_icon_by_attr() pylinuxauto.select_menu(2) diff --git a/method/dde_browser_method.py b/method/dde_browser_method.py index 7d719c4b08e92de45bc68473255992e7e13eac07..2701c2f9ed17b81b909d6a61536da3571e958d39 100644 --- a/method/dde_browser_method.py +++ b/method/dde_browser_method.py @@ -22,8 +22,3 @@ class DdeBrowserMethod(BaseMethod): def dde_browser_method_right_click_by_ocr(self, text): """在浏览器中通过属性右键点击对应的标签页""" pylinuxauto.find_element_by_ocr(text).right_click() - - -if __name__ == "__main__": - sleep(3) - DdeBrowserMethod().dde_browser_method_click_by_attr("使用 百度 搜索，或者输入网址") diff --git a/method/dde_control_center_method.py b/method/dde_control_center_method.py index 270060c2ad1a3db4d2cfc8e6e63362a091994859..24286ebfb1d1671feb869ad0be8c578fc6f9d70e 100644 --- a/method/dde_control_center_method.py +++ b/method/dde_control_center_method.py @@ -79,8 +79,3 @@ class DdeControlCenterMethod(BaseMethod): def dde_control_center_method_click_time_setting_by_attr(self): """在时间与日期模块中点击 时间设置""" self.dde_control_center_method_click_by_attr("时间设置") - - -if __name__ == "__main__": - sleep(3) - DdeControlCenterMethod() diff --git a/method/dde_dock_method.py b/method/dde_dock_method.py index b8040db4d5f8a43bc5052fcb408c24f905cbd587..5a7a823c337039724eae9f3541d3758b54c67f66 100644 --- a/method/dde_dock_method.py +++ b/method/dde_dock_method.py @@ -46,7 +46,3 @@ class DdeDockMethod(BaseMethod): def dde_dock_method_click_datetime_icon_by_attr(self): """在任务栏中通过元素点击右下角时间区域""" self.dde_dock_method_click_by_attr("Btn_datetime") - - -if __name__ == "__main__": - DdeDockMethod().dde_dock_method_click_datetime_icon_by_attr() diff --git a/method/dde_editor_method.py b/method/dde_editor_method.py index 4dcf3938ee47572f321733af6732f71f8f517599..172b2d32f41d14a61c8ca8f7bf5d791aee265162 100644 --- a/method/dde_editor_method.py +++ b/method/dde_editor_method.py @@ -48,8 +48,3 @@ class DdeEditorMethod(BaseMethod): """在文本编辑器中通过标签右边的关闭图表关闭当前标签""" self.base_method_click_by_img("deepin_editor_close_tab_icon.png") sleep(1) - - -if __name__ == "__main__": - sleep(3) - DdeEditorMethod().dde_editor_method_close_tab_by_attr("*未命名文档1") diff --git a/method/dde_font_manager_method.py b/method/dde_font_manager_method.py index 46d7f8186d8fa09b05a7535db1609a8a0d63ac69..97d3d6e9d4d4e77eb71ea6374d276c0002294cae 100644 --- a/method/dde_font_manager_method.py +++ b/method/dde_font_manager_method.py @@ -14,8 +14,3 @@ class DdeFontManagerMethod(BaseMethod): def dde_font_manager_method_click_search_box_attr(self): """在字体管理器中点击搜索框""" self.dde_font_manager_method_click_by_attr("DSearchEditIconButton") - - -if __name__ == "__main__": - sleep(3) - DdeFontManagerMethod().dde_font_manager_method_click_search_box_attr() diff --git a/method/dde_method.py b/method/dde_method.py index c3f9022eacf2743517ae67091a71ade9f272ec28..951047cdbe95ed4980b27c17ca4b7efd579e8d66 100644 --- a/method/dde_method.py +++ b/method/dde_method.py @@ -339,8 +339,3 @@ class DdeMethod( self.dde_editor_method_click_documents_in_pop_window_by_img() self.dde_methode_click_save_btn_in_pop_window() sleep(1) - - -if __name__ == "__main__": - sleep(3) - pylinuxauto.find_element_by_attr_path("/dde-file-manager/主目录").click() diff --git a/method/deepin_log_viewer_method.py b/method/deepin_log_viewer_method.py index cce86080070f6112ac77040aaefe3c6f7fc7de7c..cde555052c5ba9db0d2cd9038ff80221bc5282f7 100644 --- a/method/deepin_log_viewer_method.py +++ b/method/deepin_log_viewer_method.py @@ -29,8 +29,3 @@ class DeepinLogViewerMethod(BaseMethod): sleep(3) pylinuxauto.enter() sleep(2) - - -if __name__ == "__main__": - sleep(3) - DeepinLogViewerMethod().deepin_log_viewer_method_click_export_btn_by_attr() diff --git a/method/image_res/test_txt_details.png b/method/image_res/test_txt_details.png index 64751242df89b80aa339ae4f571bbfa20320af3d..d0348562aed84eae3d149a0fa4e7767eb84fbd02 100644 Binary files a/method/image_res/test_txt_details.png and b/method/image_res/test_txt_details.png differ