diff --git a/case/assert_res/test_dde_1271213.png b/case/assert_res/test_dde_1271213.png new file mode 100644 index 0000000000000000000000000000000000000000..d3bf6a5784fdc215a33f179fa070c2cb7deb2f6d Binary files /dev/null and b/case/assert_res/test_dde_1271213.png differ diff --git a/case/test_dde_1270985.py b/case/test_dde_1270985.py index a9bf42f74156b79ad68373e7ceb5a9c760782435..52c4c7b95bd8bda130ff12363bb25db1857e6c1a 100644 --- a/case/test_dde_1270985.py +++ b/case/test_dde_1270985.py @@ -1,10 +1,7 @@ -from tuned.exports import start - from case.base_case import BaseCase from method.dde_method import DdeMethod -from youqu3 import sleep -from method.dde_control_center_method import DdeControlCenterMethod -from youqu3.gui import pylinuxauto +from pylinuxauto import sleep +import pylinuxauto class TestDdeCase(BaseCase): diff --git a/case/test_dde_1270989.py b/case/test_dde_1270989.py index 7e34c041e334abf720f99e9b3724ad217a2ae199..1ddc4fb04fdc269923ea84bdc5d7281bf3470540 100644 --- a/case/test_dde_1270989.py +++ b/case/test_dde_1270989.py @@ -1,7 +1,6 @@ from case.base_case import BaseCase from method.dde_method import DdeMethod -from youqu3 import sleep -from method.dde_control_center_method import DdeControlCenterMethod +from pylinuxauto import sleep class TestDdeCase(BaseCase): diff --git a/case/test_dde_1271005.py b/case/test_dde_1271005.py index 98d37d939052bc56076bdc294aaa7d4acaaf4451..eba9fcd3994e6fc58eb57cbb5e2cb5008cc461ff 100644 --- a/case/test_dde_1271005.py +++ b/case/test_dde_1271005.py @@ -1,6 +1,6 @@ from case.base_case import BaseCase from method.dde_method import DdeMethod -from youqu3 import sleep +from pylinuxauto import sleep class TestDdeCase(BaseCase): diff --git a/case/test_dde_1271011.py b/case/test_dde_1271011.py index f1ae3a7dd7cfc3101d68278348a37f2f501683b6..31bfaabc52878ab03e9ebd2198bcbf40cf034428 100644 --- a/case/test_dde_1271011.py +++ b/case/test_dde_1271011.py @@ -1,7 +1,6 @@ from case.base_case import BaseCase from method.dde_method import DdeMethod -from youqu3 import sleep -from method.dde_control_center_method import DdeControlCenterMethod +from pylinuxauto import sleep class TestDdeCase(BaseCase): diff --git a/case/test_dde_1271033.py b/case/test_dde_1271033.py index 44c4e51a5d4172f0e4842e77bc83bb10e46215ae..9695e2e8297dd76df96c8666da00114bcc852c6a 100644 --- a/case/test_dde_1271033.py +++ b/case/test_dde_1271033.py @@ -1,6 +1,6 @@ from case.base_case import BaseCase from method.dde_method import DdeMethod -from youqu3 import sleep +from pylinuxauto import sleep from method.dde_control_center_method import DdeControlCenterMethod diff --git a/case/test_dde_1271037.py b/case/test_dde_1271037.py index e2fce638749f5068dc8ef418162da7c98e00f0e7..de2b4ac0a7c787425adf7f7eb6ec7b94572eaae1 100644 --- a/case/test_dde_1271037.py +++ b/case/test_dde_1271037.py @@ -1,8 +1,8 @@ -from youqu3.gui import pylinuxauto +import pylinuxauto from case.base_case import BaseCase from method.base_method import BaseMethod from method.dde_method import DdeMethod -from youqu3 import sleep +from pylinuxauto import sleep class TestDdeCase(BaseCase): diff --git a/case/test_dde_1271123.py b/case/test_dde_1271123.py index c5196cd5187a9995eb82a15d495c52449e2d9224..ddcb2d49a731d6d9945845117efb86f5f226c5fa 100644 --- a/case/test_dde_1271123.py +++ b/case/test_dde_1271123.py @@ -1,7 +1,7 @@ -from youqu3.gui import pylinuxauto +import pylinuxauto from case.base_case import BaseCase from method.dde_method import DdeMethod -from youqu3 import sleep +from pylinuxauto import sleep class TestDdeCase(BaseCase): diff --git a/case/test_dde_1271213.py b/case/test_dde_1271213.py new file mode 100644 index 0000000000000000000000000000000000000000..b8a0e3c2f937c0c525de9f29671278375dec96bf --- /dev/null +++ b/case/test_dde_1271213.py @@ -0,0 +1,23 @@ +from case.base_case import BaseCase +from method.dde_method import DdeMethod +from pylinuxauto import sleep + + +class TestDdeCase(BaseCase): + def test_dde_1271213_1(self): + """在字体管理器中搜索字体名称""" + DdeMethod().dde_method_open_software_by_launcher("zitiguanli") + sleep(6) + DdeMethod().dde_method_search_font_in_font_manager("FreeMono-bold Oblique") + self.assert_image_exist_in_dde("test_dde_1271213.png") + + def test_dde_1271213_2(self): + """在字体管理器中搜索非字体名称""" + DdeMethod().dde_method_open_software_by_launcher("zitiguanli") + sleep(6) + DdeMethod().dde_method_search_font_in_font_manager("FreeMono-bold##") + self.assert_ocr_exist("无搜索结果") + + def teardown_method(self): + """关闭字体管理器""" + DdeMethod().dde_method_close_window() diff --git a/case/test_dde_1271301.py b/case/test_dde_1271301.py index 03b77d9f831d4ce6063583845cad5168057941e5..3087e133cd02aaa0cb2dad14abf158fd7e97be08 100644 --- a/case/test_dde_1271301.py +++ b/case/test_dde_1271301.py @@ -1,6 +1,5 @@ -import pytest from case.base_case import BaseCase -from youqu3 import sleep +from pylinuxauto import sleep from method.dde_method import DdeMethod diff --git a/config.py b/config.py index 5b8744b642e5560d7896cf502afdfd70bef5e756..107595ba636b00edf83566a58ebb5caf86d31509 100644 --- a/config.py +++ b/config.py @@ -7,6 +7,8 @@ import pathlib import os +from pylinuxauto.config import config as pylinuxauto_config +from youqu3 import setting class _Config: @@ -16,5 +18,9 @@ class _Config: STATIC_RES = ROOTDIR / "method/static_res" BASE_PATH = os.getcwd() + pylinuxauto_config.OCR_SERVER_IP = "10.8.13.7" + pylinuxauto_config.IMAGE_SERVER_IP = "10.8.12.175" + setting.REPORT_SERVER_IP = "10.8.12.47" + config = _Config() diff --git a/dde.csv b/dde.csv index 6ecae0bcd250e2e1d43c47b74481eab2b085be86..090070c12073a34f963edcd9c6f6d99b8faa6409 100644 --- a/dde.csv +++ b/dde.csv @@ -1,3 +1,10 @@ 脚本ID,跳过原因,确认修复,废弃用例 -test_euler_104633, -002, +1270985,,, +1270989,,, +1271005,,, +1271011,,, +1271033,,, +1271035,,, +1271037,,, +1271123,,, +1271301,,, \ No newline at end of file diff --git a/method/assert_method.py b/method/assert_method.py index f7b89fc8cd612bb2c6db774819553732150738f7..5d8dfe5776229dde99f2c3ad51adeef595b00535 100644 --- a/method/assert_method.py +++ b/method/assert_method.py @@ -5,8 +5,7 @@ :Date :2024/08/22 13:15:47 """ -from dbus.decorators import method -from youqu3.assertx import Assert +from pylinuxauto.assertx import Assert from config import config diff --git a/method/base_method.py b/method/base_method.py index f38e93d0be0811333eeccc4d53d0ee70c7f4087c..a847e5f024b482b7bafe98043098eae9ed0b7f5c 100644 --- a/method/base_method.py +++ b/method/base_method.py @@ -8,7 +8,7 @@ from funnylog2.config import config as funnylog2_config funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"] -from youqu3.gui import pylinuxauto +import pylinuxauto from config import config diff --git a/method/dde_browser_method.py b/method/dde_browser_method.py index 83f3e1de7aadc763462e5020cca7cf93baedb4bd..d962f23d079fa68f85492856a6e5065491a28e27 100644 --- a/method/dde_browser_method.py +++ b/method/dde_browser_method.py @@ -2,19 +2,19 @@ from time import sleep from funnylog2.config import config as funnylog2_config funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"] -from youqu3 import log -from youqu3.gui import pylinuxauto -from config import config +import pylinuxauto from method.base_method import BaseMethod -from method.dde_dock_method import DdeDockMethod class DdeBrowserMethod(BaseMethod): def dde_browser_method_click_by_attr(self, path): + """在浏览器中通过属性进行点击""" pylinuxauto.find_element_by_attr_path(f"/Firefox/{path}").click() def dde_browser_method_click_menu_icon_by_img(self): + """在浏览器中点击右上角的菜单按钮""" self.dde_method_click_by_img("firefox_menu_icon.png") def dde_browser_method_click_close_btn_by_attr(self): + """在浏览器中点击右上角的关闭按钮""" self.dde_method_click_by_img("firefox_close_btn.png") diff --git a/method/dde_control_center_method.py b/method/dde_control_center_method.py index df25618d77c54d39814ea8a215e3edd04d4225aa..2a38c6bb9f7ac0aa8bc3517fb9be704d0d8a2425 100644 --- a/method/dde_control_center_method.py +++ b/method/dde_control_center_method.py @@ -2,8 +2,7 @@ from time import sleep from funnylog2.config import config as funnylog2_config funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"] -from youqu3 import log -from youqu3.gui import pylinuxauto +import pylinuxauto from method.base_method import BaseMethod diff --git a/method/dde_dock_method.py b/method/dde_dock_method.py index 01fee046b7e4ac90d3d7080e727a3b31ff1ae3b7..dee32e0d1bb168f23e23c2d44638b96b391ef73d 100644 --- a/method/dde_dock_method.py +++ b/method/dde_dock_method.py @@ -2,8 +2,7 @@ from time import sleep from funnylog2.config import config as funnylog2_config funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"] -from youqu3.gui import pylinuxauto -from config import config +import pylinuxauto from method.base_method import BaseMethod diff --git a/method/dde_font_manager_method.py b/method/dde_font_manager_method.py new file mode 100644 index 0000000000000000000000000000000000000000..46d7f8186d8fa09b05a7535db1609a8a0d63ac69 --- /dev/null +++ b/method/dde_font_manager_method.py @@ -0,0 +1,21 @@ +from time import sleep +from funnylog2.config import config as funnylog2_config + +funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"] +import pylinuxauto +from method.base_method import BaseMethod + + +class DdeFontManagerMethod(BaseMethod): + def dde_font_manager_method_click_by_attr(self, path): + """在字体管理器中通过元素点击""" + pylinuxauto.find_element_by_attr_path(f"/deepin-font-manager/{path}").click() + + def dde_font_manager_method_click_search_box_attr(self): + """在字体管理器中点击搜索框""" + self.dde_font_manager_method_click_by_attr("DSearchEditIconButton") + + +if __name__ == "__main__": + sleep(3) + DdeFontManagerMethod().dde_font_manager_method_click_search_box_attr() diff --git a/method/dde_launcher_method.py b/method/dde_launcher_method.py index 6b4fd255ca7af4bfbc4a84f1b02e2c739972fd7e..640607c6eb4831c6bb3b93e474f15eee24c09a08 100644 --- a/method/dde_launcher_method.py +++ b/method/dde_launcher_method.py @@ -1,12 +1,8 @@ from funnylog2.config import config as funnylog2_config funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"] - -from youqu3 import log -from youqu3.gui import pylinuxauto -from config import config +import pylinuxauto from method.base_method import BaseMethod -from method.dde_dock_method import DdeDockMethod class DdeLauncherMethod(BaseMethod): diff --git a/method/dde_method.py b/method/dde_method.py index 7724710b98dc93fee3e5f3791a8bb21a3beb2ecd..81f1b2dcdf1eab4ab52f9ae2b62e3c2beec8c536 100644 --- a/method/dde_method.py +++ b/method/dde_method.py @@ -7,21 +7,22 @@ from time import sleep from funnylog2.config import config as funnylog2_config - -from config import config from method.base_method import BaseMethod +from method.dde_browser_method import DdeBrowserMethod funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"] -from youqu3 import log -from youqu3.gui import pylinuxauto +from funnylog2 import log +import pylinuxauto from method.dde_dock_method import DdeDockMethod from method.dde_control_center_method import DdeControlCenterMethod from method.dde_launcher_method import DdeLauncherMethod -from method.dde_browser_method import DdeBrowserMethod +from method.dde_font_manager_method import DdeFontManagerMethod @log -class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod, DdeBrowserMethod): +class DdeMethod( + DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod, DdeFontManagerMethod, DdeBrowserMethod +): """应用方法主类""" def dde_method_open_software_by_launcher(self, text): @@ -245,6 +246,13 @@ class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod, DdeBro self.dde_control_center_click_delete_btn_by_img() sleep(1) + def dde_method_search_font_in_font_manager(self, fontname): + """在字体管理器中搜索字体""" + self.dde_font_manager_method_click_search_box_attr() + pylinuxauto.input_message(fontname) + sleep(3) + pylinuxauto.enter() + if __name__ == "__main__": sleep(3)