From b846497d8f4c90623c41f29e92b6b4b71b4d2ce3 Mon Sep 17 00:00:00 2001 From: lixintao Date: Wed, 18 Dec 2024 10:49:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E4=BD=93=E7=94=A8=E4=BE=8Bmethod=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lixintao --- case/test_dde_1271207.py | 4 ++-- case/test_dde_1271211.py | 8 ++++---- method/vender/deepin_font_manager_method.py | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/case/test_dde_1271207.py b/case/test_dde_1271207.py index 8873027..4861b75 100644 --- a/case/test_dde_1271207.py +++ b/case/test_dde_1271207.py @@ -14,7 +14,7 @@ class TestFontForbiddenCase(BaseCase): font = DeepinFontManagerMethod() font.method_click_menu_by_image() font.method_click_add_font_by_ocr() - font.method_search_fonts("dde_autotest_euler/method/static_res/fonts/NotoSansLinearB") + font.method_search_fonts_by_image("dde_autotest_euler/method/static_res/fonts/NotoSansLinearB") font.method_import_one_fonts_by_ocr("NotoSansLinearB-Regular") sleep(3) @@ -36,7 +36,7 @@ class TestFontForbiddenCase(BaseCase): self.assert_ocr_exist("Noto Sans Linear B-Regular") font.method_click_font_by_ocr("Noto Sans Linear B-Regular") - DeepinFontManagerMethod().method_del_font() + DeepinFontManagerMethod().method_del_font_by_image() # sleep(3) def teardown_method(self): diff --git a/case/test_dde_1271211.py b/case/test_dde_1271211.py index 3faba6a..dfa1657 100644 --- a/case/test_dde_1271211.py +++ b/case/test_dde_1271211.py @@ -13,10 +13,10 @@ class TestFontAddCase(BaseCase): sleep(6) DeepinFontManagerMethod().method_click_menu_by_image() DeepinFontManagerMethod().method_click_add_font_by_ocr() - DeepinFontManagerMethod().method_search_fonts("dde_autotest_euler/method/static_res/fonts/fangzheng") + DeepinFontManagerMethod().method_search_fonts_by_image("dde_autotest_euler/method/static_res/fonts/fangzheng") DeepinFontManagerMethod().method_import_one_fonts_by_ocr() self.assert_ocr_exist("吕建德字体") - DeepinFontManagerMethod().method_del_font() + DeepinFontManagerMethod().method_del_font_by_image() sleep(3) def test_dde_1271211_2(self): @@ -25,11 +25,11 @@ class TestFontAddCase(BaseCase): sleep(6) DeepinFontManagerMethod().method_click_menu_by_image() DeepinFontManagerMethod().method_click_add_font_by_ocr() - DeepinFontManagerMethod().method_search_fonts("dde_autotest_euler/method/static_res/fonts/fangzheng") + DeepinFontManagerMethod().method_search_fonts_by_image("dde_autotest_euler/method/static_res/fonts/fangzheng") DeepinFontManagerMethod().method_import_many_fonts_by_ocr() self.assert_ocr_exist("吕建德字体") self.assert_ocr_exist("真广标简体") - DeepinFontManagerMethod().method_del_font() + DeepinFontManagerMethod().method_del_font_by_image() sleep(2) def teardown_method(self): diff --git a/method/vender/deepin_font_manager_method.py b/method/vender/deepin_font_manager_method.py index 0d98c0b..f724875 100644 --- a/method/vender/deepin_font_manager_method.py +++ b/method/vender/deepin_font_manager_method.py @@ -12,6 +12,7 @@ class DeepinFontManagerMethod(BaseMethod): self.dog.element_click(path) def method_click_font_by_ocr(self, font_name): + """通过ocr点击字体""" self.click_by_ocr(font_name) def method_click_search_box_attr(self): @@ -44,7 +45,7 @@ class DeepinFontManagerMethod(BaseMethod): self.right_click(*self.ocr(font_name)) self.right_click(*self.ocr("启用字体")) - def method_search_fonts(self, fonts_path): + def method_search_fonts_by_image(self, fonts_path): """字体文件路径查找字体""" self.click_by_img("dde_fonts_search_icon.png") Src.input_message(fonts_path) @@ -63,7 +64,7 @@ class DeepinFontManagerMethod(BaseMethod): Src.ctrl_a() self.click(*self.ocr("打开")) - def method_del_font(self): + def method_del_font_by_image(self): """删除字体""" Src.delete() self.click_by_img("dde_fonts_delete_btn_icon.png") -- Gitee