From fab8a4ce5f7d3aa58c15bc2af067a41b26a6dd08 Mon Sep 17 00:00:00 2001 From: lixu Date: Tue, 19 Nov 2024 17:14:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E4=BE=8B=EF=BC=8C?= =?UTF-8?q?=E7=BB=88=E7=AB=AF=EF=BC=8C=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 打开多个窗口，点击关闭 2. 打开2个窗口，然后最小化，点击dock上图标； 在预览中点击关闭1个窗口 Signed-off-by: lixu --- case/test_dde_1271261.py | 49 ++++++++++++++++++++++++ case/test_dde_1271263.py | 1 - dde.csv | 3 +- method/image_res/min_window_btn.png | Bin 0 -> 197 bytes method/vender/dde_dock_method.py | 5 +++ method/vender/deepin_terminal_method.py | 8 ++++ 6 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 case/test_dde_1271261.py create mode 100755 method/image_res/min_window_btn.png diff --git a/case/test_dde_1271261.py b/case/test_dde_1271261.py new file mode 100644 index 0000000..6f8f90e --- /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 3bc3bab..3079cff 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 fa86552..2196406 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 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)u!2~2{Z9Cx(q&N#aB8wRq_>O=u<5X=vX`o=a zr;B5VMQ?J+tAFPmY!4iAaXl;{5g{SDGF!&fck#Z$=3AS6ns1d}G3hHb(b6#DJG{rV z(&Z)3%of)Pof8`wc?CJw{QHvl>gc1J8$5Z$>VI_@3I^+cYblzvwZrGJTi8cW+t2s@ t{W$mO-SKikKfhCFt3LnzeYX5PW6^2RLQ&NR=YURN@O1TaS?83{1OQJ*OppKo literal 0 HcmV?d00001 diff --git a/method/vender/dde_dock_method.py b/method/vender/dde_dock_method.py index 3332ad3..dc42407 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 a4b022b..c968018 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 -- Gitee