diff --git a/case/test_dde_1271299.py b/case/test_dde_1271299.py index df126912be0e2c57a313254979ae3f413f5d6118..23b2474f2cd5cf63da9924552920408670723726 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 b88fd431042d6af4229c10391e4a7ab9ac69fcbd..4cd9c2ccaacf3fa5f734c167584db79728aa38f2 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 b8095d48b370e6ff1351783ab1a54c3921006090..06b10761a0e1d93ca519b66dfba464f3ab59be14 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 6bcfb1bd88f774d3894a9e63777539966ee918a6..97a09c61e9283608c74d2b4c86158d8f2e1ba18e 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 1293e658803246c1ec96c6fa6d29775da3c3820e..910c18aef88f6b2507f783a6cc55ce707efa8b5d 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 7a6efe2a244855b906a0bf371242440289b0b625..8e1cfbcdf77f8dd261e19c75c4b0a3a3a259b46c 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 2d16975fcff1ac6e965cc49a88695ba077fd0bd2..8df2e82f359e147d31d5e6c6443ef7c728321110 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 aa72536f303ed7e62235c01c8b39722109b53e82..ca222825f94f5c560da689be98bfad7d4b1c2722 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 cff40cecfa82e69d1402136579efd7be18781f71..003fd2d2723df407476d2f30d8152718ddb17a9e 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 05233ee72b4bc533334466a9d2ed42d2e89f2d1f..59987744d82d4d6392649cf0239e23e66093c6cc 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 cedd7df78791b4b2dc8b4996db8be38c6578b23f..e30e2d1b8eb706d2c1bac4f959ef9c87675ee9e9 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 2ae5e444f1729c1b8d40ccd530faea9de079cb04..92ddaab6976c1754f382d4b1a492dbfcd9af73f4 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 a2ecb4aac0ad401132db97df7cc1e32430c8f9b9..a4b022bbc81dc5497e293ea2913d311ef9583a92 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")