From 252b8170cb863bc64a3124bccf856b671aaf8e45 Mon Sep 17 00:00:00 2001 From: mikigo Date: Wed, 6 Nov 2024 05:06:08 -0500 Subject: [PATCH] =?UTF-8?q?fix=20some=20failed=20error=20fix=20list:=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20?= =?UTF-8?q?case/test=5Fdde=5F1271299.py=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20case/test=5Fdde=5F127?= =?UTF-8?q?1309.py=20=20=20=20=20=20=20=20=20=E4=BF=AE=E6=94=B9=EF=BC=9A?= =?UTF-8?q?=20=20=20=20=20case/test=5Fdde=5F1271311.py=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20case/test=5F?= =?UTF-8?q?dde=5F1271313.py=20=20=20=20=20=20=20=20=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9A=20=20=20=20=20case/test=5Fdde=5F1271315.py=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20cas?= =?UTF-8?q?e/test=5Fdde=5F1271317.py=20=20=20=20=20=20=20=20=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9A=20=20=20=20=20case/test=5Fdde=5F1271319.py?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20?= =?UTF-8?q?=20=20case/test=5Fdde=5F1271321.py=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20case/test=5Fdde=5F127?= =?UTF-8?q?1327.py=20=20=20=20=20=20=20=20=20=E4=BF=AE=E6=94=B9=EF=BC=9A?= =?UTF-8?q?=20=20=20=20=20case/test=5Fdde=5F1271331.py=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20method/dde?= =?UTF-8?q?=5Fmethod.py=20=20=20=20=20=20=20=20=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9A=20=20=20=20=20method/vender/dde=5Fdesktop=5Fmethod.py?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20?= =?UTF-8?q?=20=20method/vender/deepin=5Fterminal=5Fmethod.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- case/test_dde_1271299.py | 2 +- case/test_dde_1271309.py | 2 +- case/test_dde_1271311.py | 2 +- case/test_dde_1271313.py | 2 +- case/test_dde_1271315.py | 4 ---- case/test_dde_1271317.py | 2 +- case/test_dde_1271319.py | 12 +++++++----- case/test_dde_1271321.py | 5 +++-- case/test_dde_1271327.py | 1 + case/test_dde_1271331.py | 10 +++++----- method/dde_method.py | 1 + method/vender/dde_desktop_method.py | 5 +++++ method/vender/deepin_terminal_method.py | 5 ----- 13 files changed, 27 insertions(+), 26 deletions(-) diff --git a/case/test_dde_1271299.py b/case/test_dde_1271299.py index df12691..23b2474 100644 --- a/case/test_dde_1271299.py +++ b/case/test_dde_1271299.py @@ -7,7 +7,7 @@ class TestDdeCase(BaseCase): def test_dde_1271299(self): """添加系统语言""" DdeMethod().add_english_system_language_in_control_center() - self.assert_element_exist("$//dde-control-center//American English - 美国英语") + self.assert_element_exist("$/dde-control-center//American English - 美国英语") def teardown_method(self): """清理环境，将新增的系统语言删除""" diff --git a/case/test_dde_1271309.py b/case/test_dde_1271309.py index b88fd43..4cd9c2c 100644 --- a/case/test_dde_1271309.py +++ b/case/test_dde_1271309.py @@ -12,7 +12,7 @@ class TestDdeCase(BaseCase): sleep(1) # 等待 1 秒，判断launcher是否启动 self.assert_image_exist_in_dde("test_dde_1271309.png") - DdeMethod().kill_process_by_cmd("dde-launcher") + DdeMethod().dde_dock.kill_process_by_cmd("dde-launcher") sleep(3) self.assert_image_not_exist_in_dde("test_dde_1271309.png") sleep(3) diff --git a/case/test_dde_1271311.py b/case/test_dde_1271311.py index b8095d4..06b1076 100644 --- a/case/test_dde_1271311.py +++ b/case/test_dde_1271311.py @@ -21,5 +21,5 @@ class TestDdeCase(BaseCase): def teardown_method(self): """环境清理，关闭火狐浏览器""" - DdeMethod().browser.click_close_btn_by_attr() + DdeMethod().browser.kill_process("Firefox") sleep(3) diff --git a/case/test_dde_1271313.py b/case/test_dde_1271313.py index 6bcfb1b..97a09c6 100644 --- a/case/test_dde_1271313.py +++ b/case/test_dde_1271313.py @@ -34,5 +34,5 @@ class TestDdeCase(BaseCase): def teardown_method(self): """通过命令关闭启动器""" - DdeMethod().kill_process_by_cmd("dde-launcher") + DdeMethod().dde_dock.kill_process_by_cmd("dde-launcher") sleep(3) diff --git a/case/test_dde_1271315.py b/case/test_dde_1271315.py index 1293e65..910c18a 100644 --- a/case/test_dde_1271315.py +++ b/case/test_dde_1271315.py @@ -27,7 +27,3 @@ class TestDdeCase(BaseCase): Src.click(10, 10) euler.click_restore() sleep(1) - - def teardown_method(self): - """通过命令关闭启动器""" - pass diff --git a/case/test_dde_1271317.py b/case/test_dde_1271317.py index 7a6efe2..8e1cfbc 100644 --- a/case/test_dde_1271317.py +++ b/case/test_dde_1271317.py @@ -31,5 +31,5 @@ class TestDdeCase(BaseCase): def teardown_method(self): """通过命令关闭启动器""" - DdeMethod().kill_process_by_cmd("dde-launcher") + DdeMethod().dde_dock.kill_process_by_cmd("dde-launcher") sleep(3) diff --git a/case/test_dde_1271319.py b/case/test_dde_1271319.py index 2d16975..8df2e82 100644 --- a/case/test_dde_1271319.py +++ b/case/test_dde_1271319.py @@ -9,22 +9,24 @@ class TestDdeCase(BaseCase): """任务栏-应用区域的添加&移除""" euler = DdeMethod() euler.dde_dock.click_launcher_btn_by_attr() + sleep(2) euler.dde_launcher.click_search_box_by_attr() Src.input("kantu") sleep(2) euler.dde_launcher.right_click_by_attr("看图") Src.select_menu(3) sleep(2) - self.assert_element_exist("/dde-dock/Btn_看图") + self.assert_element_exist("$/dde-dock//Btn_看图") euler.dde_launcher.right_click_by_attr("看图") Src.select_menu(3) sleep(2) - self.assert_element_not_exist("/dde-dock/Btn_看图") + self.assert_element_not_exist("$/dde-dock//Btn_看图") def test_dde_1271319_2(self): """任务栏-应用区域的添加&移除""" euler = DdeMethod() euler.dde_dock.click_launcher_btn_by_attr() + sleep(2) euler.dde_launcher.click_search_box_by_attr() Src.input("kantu") sleep(2) @@ -32,13 +34,13 @@ class TestDdeCase(BaseCase): Src.select_menu(3) Src.win_left() sleep(2) - self.assert_element_exist("/dde-dock/Btn_看图") + self.assert_element_exist("$/dde-dock//Btn_看图") euler.dde_dock.right_click_by_attr("Btn_看图") Src.select_menu(2) sleep(2) - self.assert_element_not_exist("/dde-dock/Btn_看图") + self.assert_element_not_exist("$/dde-dock//Btn_看图") def teardown_method(self): """通过命令关闭启动器""" - DdeMethod().kill_process_by_cmd("dde-launcher") + DdeMethod().dde_dock.kill_process_by_cmd("dde-launcher") sleep(3) diff --git a/case/test_dde_1271321.py b/case/test_dde_1271321.py index aa72536..ca22282 100644 --- a/case/test_dde_1271321.py +++ b/case/test_dde_1271321.py @@ -5,6 +5,7 @@ from apps.dde_autotest_euler.method.dde_method import DdeMethod class TestDdeCase(BaseCase): + def test_dde_1271321(self): """任务栏-系统时间""" euler = DdeMethod() @@ -12,7 +13,7 @@ class TestDdeCase(BaseCase): sleep(2) self.assert_ocr_exist("日历") sleep(1) - euler.close_window() + DdeMethod().dde_dock.kill_process("dde-calendar") sleep(1) euler.dde_dock.right_click_datetime_icon_by_attr() Src.select_menu(1) @@ -29,4 +30,4 @@ class TestDdeCase(BaseCase): def teardown_method(self): """通过命令关闭控制中心窗口""" - DdeMethod().close_window() + DdeMethod().dde_dock.kill_process("dde-calendar") diff --git a/case/test_dde_1271327.py b/case/test_dde_1271327.py index cff40ce..003fd2d 100644 --- a/case/test_dde_1271327.py +++ b/case/test_dde_1271327.py @@ -4,6 +4,7 @@ from apps.dde_autotest_euler.case.base_case import BaseCase class TestDdeCase(BaseCase): + def test_dde_1271327_1(self): """快捷键关闭剪贴板""" Src.hot_key("ctrl", "alt", "v") diff --git a/case/test_dde_1271331.py b/case/test_dde_1271331.py index 05233ee..5998774 100644 --- a/case/test_dde_1271331.py +++ b/case/test_dde_1271331.py @@ -7,17 +7,17 @@ from apps.dde_autotest_euler.method.dde_method import DdeMethod class TestDdeCase(BaseCase): + def test_dde_1271331(self): """桌面-右键菜单-在终端中打开""" Src.hot_key("win", "d") time.sleep(2) - euler = DeepinTerminalMethod() - euler.right_click_by_xy() + euler = DdeMethod() + euler.dde_desktop.right_click_by_xy() time.sleep(2) - - self.assert_ocr_exist("uos@") + self.assert_process_status(True, "deepin-terminal") def teardown_method(self): """关闭窗口""" - DdeMethod().close_window() + DdeMethod().dde_dock.kill_process("deepin-terminal") time.sleep(2) diff --git a/method/dde_method.py b/method/dde_method.py index cedd7df..e30e2d1 100644 --- a/method/dde_method.py +++ b/method/dde_method.py @@ -93,6 +93,7 @@ class DdeMethod(Src): self.dde_launcher.click_search_box_by_attr() ShortCut.input_message(text) ShortCut.enter() + sleep(2) def close_window(self): """关闭窗口""" diff --git a/method/vender/dde_desktop_method.py b/method/vender/dde_desktop_method.py index 2ae5e44..92ddaab 100644 --- a/method/vender/dde_desktop_method.py +++ b/method/vender/dde_desktop_method.py @@ -9,3 +9,8 @@ class DdeDesktopMethod(BaseMethod): def click_by_attr(self, path): """在启动器中通过元素点击""" self.dog.element_click(path) + + def right_click_by_xy(self): + """通过右键点击【在终端中打开】""" + self.right_click(960, 540) + self.click_by_ocr("在终端中打开") diff --git a/method/vender/deepin_terminal_method.py b/method/vender/deepin_terminal_method.py index a2ecb4a..a4b022b 100644 --- a/method/vender/deepin_terminal_method.py +++ b/method/vender/deepin_terminal_method.py @@ -6,11 +6,6 @@ class DeepinTerminalMethod(BaseMethod): def __init__(self): super().__init__("deepin-terminal") - def right_click_by_xy(self): - """通过右键点击【在终端中打开】""" - self.right_click(960, 540) - self.click_by_ocr("在终端中打开") - def click_option_by_attr(self): """在终端界面内点击右上角的【设置】按钮""" self.dog.element_click("DTitlebarDWindowOptionButton") -- Gitee