From 1e326c7064168519cc2d8d18728e6ba915831dbf Mon Sep 17 00:00:00 2001 From: lixu Date: Tue, 19 Nov 2024 18:24:23 +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=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 打开终端，右键/菜单栏选择设置，检查设置界面显示 2. 点击左边标题，检查右边内容显示 3. 鼠标移动到右边进行滚动 Signed-off-by: lixu --- case/assert_res/test_dde_1271251_1.png | Bin 0 -> 2265 bytes case/assert_res/test_dde_1271251_2.png | Bin 0 -> 1599 bytes case/test_dde_1271251.py | 80 ++++++++++++++++++++++++ dde.csv | 3 +- method/vender/deepin_terminal_method.py | 6 +- 5 files changed, 87 insertions(+), 2 deletions(-) create mode 100755 case/assert_res/test_dde_1271251_1.png create mode 100755 case/assert_res/test_dde_1271251_2.png create mode 100644 case/test_dde_1271251.py diff --git a/case/assert_res/test_dde_1271251_1.png b/case/assert_res/test_dde_1271251_1.png new file mode 100755 index 0000000000000000000000000000000000000000..fc0d3a4a705ff01238d69bfc65ab04651c6b682e GIT binary patch literal 2265 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 literal 0 HcmV?d00001 diff --git a/case/test_dde_1271251.py b/case/test_dde_1271251.py new file mode 100644 index 0000000..efe5ca0 --- /dev/null +++ b/case/test_dde_1271251.py @@ -0,0 +1,80 @@ +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_1271251(self): + """前置和后置""" + Src.ctrl_alt_t() + sleep(2) + DdeMethod().deepin_terminal.click_option_by_attr() + sleep(5) + for _ in range(4): + Src.down() + Src.enter() + sleep(3) + + yield + Src.kill_process("deepin-terminal") + + def test_dde_1271251_1(self): + """终端——设置界面显示""" + # 1. 打开终端，右键/菜单栏选择设置，检查设置界面显示 + # 1. 和设计图显示一致，左边标题列表，右边显示具体参数设置（基础设置中不显示主题；终端设置界面去除关于； + # 高级设置下：光标闪烁中新增：选中文字时复制到剪贴板（默认关闭）； + # 滚动设置中去除回滚行数；窗口设置中新增分屏、丢失焦点后隐藏雷神窗口（默认关闭） + self.assert_ocr_not_exist("主题", max_match_number=1) + self.assert_ocr_not_exist("关于", max_match_number=1) + + def test_dde_1271251_2(self): + """终端——设置界面显示""" + # 1. 打开终端，右键/菜单栏选择设置，检查设置界面显示 + # 高级设置下：光标闪烁中新增：选中文字时复制到剪贴板（默认关闭）； + euler = DdeMethod() + euler.click(*euler.ocr("高级设置")) + sleep(3) + self.assert_image_exist_in_dde("test_dde_1271251_1.png", rate=0.9) + + def test_dde_1271251_3(self): + """终端——设置界面显示""" + # 1. 打开终端，右键/菜单栏选择设置，检查设置界面显示 + # 滚动设置中去除回滚行数；窗口设置中新增分屏、丢失焦点后隐藏雷神窗口（默认关闭） + euler = DdeMethod() + euler.click(*euler.ocr("高级设置")) + sleep(3) + self.assert_ocr_not_exist("回滚行数", max_match_number=1) + euler.deepin_terminal.click_option_dialog_center_by_image() + sleep(3) + Src.mouse_scroll(-2) + sleep(3) + self.assert_image_exist_in_dde("test_dde_1271251_2.png", rate=0.9) + + def test_dde_1271251_4(self): + """终端——设置界面显示""" + # 2. 点击左边标题，检查右边内容显示 + # 2. 被选择的标题自动切换到最上方 + euler = DdeMethod() + euler.click(*euler.ocr("高级设置")) + sleep(3) + self.assert_ocr_exist("光标风格") + + def test_dde_1271251_5(self): + """终端——设置界面显示""" + # 3. 鼠标移动到右边进行滚动 + # 3. 可以上下滚动查看 + euler = DdeMethod() + euler.deepin_terminal.click_option_dialog_center_by_image() + sleep(3) + Src.mouse_scroll(-30) + self.assert_ocr_not_exist("字体大小", max_match_number=1) + sleep(5) + Src.mouse_scroll(30) + self.assert_ocr_exist("字体大小") diff --git a/dde.csv b/dde.csv index acebd0e..07d355b 100644 --- a/dde.csv +++ b/dde.csv @@ -52,4 +52,5 @@ 1271275,,, 1271263,,, 1271261,,, -1271259,,, \ No newline at end of file +1271259,,, +1271251,,, \ No newline at end of file diff --git a/method/vender/deepin_terminal_method.py b/method/vender/deepin_terminal_method.py index c968018..c598aa4 100644 --- a/method/vender/deepin_terminal_method.py +++ b/method/vender/deepin_terminal_method.py @@ -16,4 +16,8 @@ class DeepinTerminalMethod(BaseMethod): def click_window_min_by_image(self): """终端右上角，最小化""" - self.click_by_img("min_window_btn.png") \ No newline at end of file + self.click_by_img("min_window_btn.png") + + def click_option_dialog_center_by_image(self): + """终端右上角，最小化""" + self.dog.element_click("DSettingDialogContentWidget") \ No newline at end of file -- Gitee