diff --git a/case/test_dde_1271261.py b/case/test_dde_1271261.py new file mode 100644 index 0000000000000000000000000000000000000000..6f8f90eb34301f17455253a7852dc8d8b1d2fa4c --- /dev/null +++ b/case/test_dde_1271261.py @@ -0,0 +1,49 @@ +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 TestDeepinTerminalCase(BaseCase): + + + @pytest.fixture(scope="function", autouse=True) + def setup_teardown_1271261(self): + """前置和后置""" + Src.ctrl_alt_t() + sleep(2) + Src.ctrl_alt_t() + sleep(3) + + yield + Src.kill_process("deepin-terminal") + + def test_dde_1271261_1(self): + """终端——关闭""" + # 1. 打开多个窗口,点击关闭 + # 1. 当前窗口被关闭 + euler = DdeMethod() + euler.deepin_terminal.click_window_x_by_image() + sleep(3) + process_num = Src.get_daemon_process_num("deepin-terminal") + self.assert_equal(1, process_num) + + def test_dde_1271261_2(self): + """终端——关闭""" + # 2. 打开2个窗口,然后最小化,点击dock上图标; 在预览中点击关闭1个窗口 + # 2. 窗口被关闭,剩下一个窗口显示正常 + euler = DdeMethod() + euler.deepin_terminal.click_window_min_by_image() + sleep(3) + x, y = euler.dde_dock.get_x_y_terminal_icon_by_attr() + Src.move_to(x, y) + sleep(8) + euler.dog.move_to(x+20, y-40) + sleep(3) + Src.click() + sleep(3) + process_num = Src.get_daemon_process_num("deepin-terminal") + self.assert_equal(1, process_num) diff --git a/case/test_dde_1271263.py b/case/test_dde_1271263.py index 3bc3bab0d0878225bb25616b582c2d8b386a07da..3079cffe1608649e11e3aeab1d9916a495ac22dd 100644 --- a/case/test_dde_1271263.py +++ b/case/test_dde_1271263.py @@ -65,4 +65,3 @@ class TestDeepinTerminalCase(BaseCase): Src.ctrl_alt_t() sleep(3) self.assert_true(Src.get_process_status("deepin-terminal")) - diff --git a/dde.csv b/dde.csv index fa865522d14d6286b40a10b6d1be2e77497eb72b..21964068020a30bc6b98448e4160eb402fce0909 100644 --- a/dde.csv +++ b/dde.csv @@ -50,4 +50,5 @@ 1271279,,, 1271277,,, 1271275,,, -1271263,,, \ No newline at end of file +1271263,,, +1271261,,, \ No newline at end of file diff --git a/method/image_res/min_window_btn.png b/method/image_res/min_window_btn.png new file mode 100755 index 0000000000000000000000000000000000000000..565b84720e19870d017f29168134cbbd9df8af9d Binary files /dev/null and b/method/image_res/min_window_btn.png differ diff --git a/method/vender/dde_dock_method.py b/method/vender/dde_dock_method.py index 3332ad3a0dba6ceb2ec4bb77f71d33be031904dd..dc424079a17eab161efaf5aeba8678ac8ff742be 100644 --- a/method/vender/dde_dock_method.py +++ b/method/vender/dde_dock_method.py @@ -13,6 +13,7 @@ class DdeDockMethod(BaseMethod): def right_click_by_attr(self, path): """在任务栏中通过元素右键点击""" self.dog.element_click(path, button=3) + def click_dde_file_manager_by_attr(self): """在任务栏点击文件管理器""" self.click_by_attr("Btn_文件管理器") @@ -48,3 +49,7 @@ class DdeDockMethod(BaseMethod): def right_click_trash_icon_by_attr(self): """在任务栏中通过元素点击右下角回收站""" self.right_click_by_attr("Btn_trash") + + def get_x_y_terminal_icon_by_attr(self): + """在任务栏中,鼠标移动到终端图标""" + return self.dog.element_center("Btn_终端") \ No newline at end of file diff --git a/method/vender/deepin_terminal_method.py b/method/vender/deepin_terminal_method.py index a4b022bbc81dc5497e293ea2913d311ef9583a92..c9680187d3cc849f1aa9b2d544eb18f5b5106b14 100644 --- a/method/vender/deepin_terminal_method.py +++ b/method/vender/deepin_terminal_method.py @@ -9,3 +9,11 @@ class DeepinTerminalMethod(BaseMethod): def click_option_by_attr(self): """在终端界面内点击右上角的【设置】按钮""" self.dog.element_click("DTitlebarDWindowOptionButton") + + def click_window_x_by_image(self): + """终端右上角,X""" + self.click_by_img("close_window_btn_1.png") + + def click_window_min_by_image(self): + """终端右上角,最小化""" + self.click_by_img("min_window_btn.png") \ No newline at end of file