From bb4c206a5d5617851bcdeb8b97889bb6ea9139af Mon Sep 17 00:00:00 2001 From: ut005790 Date: Fri, 30 Aug 2024 10:26:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=9C=A8=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=B8=AD=E4=BF=AE=E6=94=B9=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=9A=84=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cher_window.png => test_euler_1271309.png} | Bin ...n_in_window.png => test_euler_1271311.png} | Bin ..._launcher.png => test_euler_1271313_1.png} | Bin ...anager_cn.png => test_euler_1271313_2.png} | Bin ...t_euler_1271033.py => test_dde_1271033.py} | 5 ++- ...t_euler_1271035.py => test_dde_1271035.py} | 4 +-- case/test_dde_1271037.py | 29 ++++++++++++++++ ...t_euler_1271301.py => test_dde_1271301.py} | 2 +- mycase.csv => dde.csv | 0 method/dde_control_center_method.py | 9 +++++ method/dde_launcher_method.py | 2 +- method/dde_method.py | 32 ++++++++++++++++-- .../system_manager_in_all_categories_view.png | Bin 0 -> 1566 bytes 13 files changed, 73 insertions(+), 10 deletions(-) rename case/assert_res/{launcher_window.png => test_euler_1271309.png} (100%) rename case/assert_res/{firefox_icon_in_window.png => test_euler_1271311.png} (100%) rename case/assert_res/{all_categories_in_launcher.png => test_euler_1271313_1.png} (100%) rename case/assert_res/{deepin_manager_cn.png => test_euler_1271313_2.png} (100%) rename case/{test_euler_1271033.py => test_dde_1271033.py} (85%) rename case/{test_euler_1271035.py => test_dde_1271035.py} (90%) create mode 100644 case/test_dde_1271037.py rename case/{test_euler_1271301.py => test_dde_1271301.py} (94%) rename mycase.csv => dde.csv (100%) create mode 100644 method/image_res/system_manager_in_all_categories_view.png diff --git a/case/assert_res/launcher_window.png b/case/assert_res/test_euler_1271309.png similarity index 100% rename from case/assert_res/launcher_window.png rename to case/assert_res/test_euler_1271309.png diff --git a/case/assert_res/firefox_icon_in_window.png b/case/assert_res/test_euler_1271311.png similarity index 100% rename from case/assert_res/firefox_icon_in_window.png rename to case/assert_res/test_euler_1271311.png diff --git a/case/assert_res/all_categories_in_launcher.png b/case/assert_res/test_euler_1271313_1.png similarity index 100% rename from case/assert_res/all_categories_in_launcher.png rename to case/assert_res/test_euler_1271313_1.png diff --git a/case/assert_res/deepin_manager_cn.png b/case/assert_res/test_euler_1271313_2.png similarity index 100% rename from case/assert_res/deepin_manager_cn.png rename to case/assert_res/test_euler_1271313_2.png diff --git a/case/test_euler_1271033.py b/case/test_dde_1271033.py similarity index 85% rename from case/test_euler_1271033.py rename to case/test_dde_1271033.py index 60e6b1c..9d68f81 100644 --- a/case/test_euler_1271033.py +++ b/case/test_dde_1271033.py @@ -1,15 +1,14 @@ -from youqu3.gui 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 method.dde_control_center_method import DdeControlCenterMethod class TestDdeCase(BaseCase): - def test_euler_1271033(self): + def test_dde_1271033(self): """在删除账户(当前登陆)""" DdeMethod().dde_dock_method_click_control_center_btn_by_attr() + sleep(6) DdeControlCenterMethod().dde_control_center_enter_view_by_search_box("zhanghu") self.assert_image_exist_in_dde("test_euler_1271033_1") self.assert_image_exist_in_dde("test_euler_1271033_2") diff --git a/case/test_euler_1271035.py b/case/test_dde_1271035.py similarity index 90% rename from case/test_euler_1271035.py rename to case/test_dde_1271035.py index e14455f..9a996fa 100644 --- a/case/test_euler_1271035.py +++ b/case/test_dde_1271035.py @@ -3,12 +3,12 @@ from method.dde_method import DdeMethod class TestDdeCase(BaseCase): - def test_euler_1271035_1(self): + def test_dde_1271035_1(self): """在控制中心中新建标准账户""" DdeMethod().dde_method_add_common_account_by_control_center() self.assert_image_exist_in_dde("test_euler_1271035_1.png") - def test_euler_1271035_2(self): + def test_dde_1271035_2(self): """在控制中心中新建管理员账户""" DdeMethod().dde_method_add_root_account_by_control_center() self.assert_image_exist_in_dde("test_euler_1271035_2.png") diff --git a/case/test_dde_1271037.py b/case/test_dde_1271037.py new file mode 100644 index 0000000..d373056 --- /dev/null +++ b/case/test_dde_1271037.py @@ -0,0 +1,29 @@ +from youqu3.gui import pylinuxauto +from case.base_case import BaseCase +from method.base_method import BaseMethod +from method.dde_method import DdeMethod +from youqu3 import sleep + + +class TestDdeCase(BaseCase): + def test_dde_1271037(self): + """在控制中心中修改当前账户密码""" + DdeMethod().dde_dock_method_click_control_center_btn_by_attr() + sleep(6) + DdeMethod().dde_method_change_current_account_password_by_control_center() + DdeMethod().dde_control_center_method_click_automatic_login_btn_by_attr() + pylinuxauto.input_message(BaseMethod.change_password) + sleep(3) + pylinuxauto.enter() + sleep(3) + self.assert_image_not_exist_in_dde("test_euler_1271037.png") + + def teardown_method(self): + """将修改的当前账户密码重新设置为之前的密码""" + DdeMethod().dde_method_reset_current_account_password_from_change_password_by_control_center() + DdeMethod().dde_control_center_method_click_automatic_login_btn_by_attr() + pylinuxauto.input_message(BaseMethod.account_massage) + sleep(3) + pylinuxauto.enter() + sleep(3) + DdeMethod().dde_method_close_window() diff --git a/case/test_euler_1271301.py b/case/test_dde_1271301.py similarity index 94% rename from case/test_euler_1271301.py rename to case/test_dde_1271301.py index 5f16181..4695058 100644 --- a/case/test_euler_1271301.py +++ b/case/test_dde_1271301.py @@ -5,7 +5,7 @@ from method.dde_method import DdeMethod class TestDdeCase(BaseCase): - def test_euler_1271301(self): + def test_dde_1271301(self): """在控制中心中添加汉语键盘布局""" DdeMethod().dde_method_add_hanyu_keyboard_layout_in_control_center() self.assert_image_exist_in_dde("test_euler_1271301.png") diff --git a/mycase.csv b/dde.csv similarity index 100% rename from mycase.csv rename to dde.csv diff --git a/method/dde_control_center_method.py b/method/dde_control_center_method.py index 4b7e32b..672ebb9 100644 --- a/method/dde_control_center_method.py +++ b/method/dde_control_center_method.py @@ -58,6 +58,15 @@ class DdeControlCenterMethod(BaseMethod): """点击 账户 视图下的 自动登录 按钮""" self.dde_control_center_method_click_by_attr("Btn_自动登录") + def dde_control_center_method_click_reset_password_btn_by_attr(self): + """点击 账户 视图下非当前账户的 重设密码 按钮""" + self.dde_control_center_method_click_by_attr("Btn_重设密码") + + def dde_control_center_method_reduce_password_effective_time(self): + """账户视图下，减少账户密码有效时间""" + self.dde_control_center_method_click_by_attr("Editable_dspinboxchilddlineedit") + pylinuxauto.enter() + if __name__ == "__main__": sleep(3) diff --git a/method/dde_launcher_method.py b/method/dde_launcher_method.py index 3165832..6b4fd25 100644 --- a/method/dde_launcher_method.py +++ b/method/dde_launcher_method.py @@ -22,4 +22,4 @@ class DdeLauncherMethod(BaseMethod): def dde_launcher_method_click_system_manager_in_all_categories_view(self): """在启动器的 所有分类 界面点击 系统管理""" - self.dde_method_click_by_img("system_manager_in_all_categories_view.png") + self.dde_method_click_by_ocr("系统管理") diff --git a/method/dde_method.py b/method/dde_method.py index da9e567..34c072c 100644 --- a/method/dde_method.py +++ b/method/dde_method.py @@ -123,7 +123,8 @@ class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod): self.dde_control_center_method_click_by_attr("Btn_删除") sleep(5) - def dde_method_change_account_password_by_control_center(self): + def dde_method_change_current_account_password_by_control_center(self): + """在控制中心中修改当前用户密码""" self.dde_control_center_enter_view_by_search_box("xiugaimima") self.dde_control_center_method_click_by_attr("Btn_修改密码") self.dde_control_center_method_click_by_attr("Editable_oldpasswordedit") @@ -134,7 +135,8 @@ class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod): pylinuxauto.input_message(BaseMethod.change_password) self.dde_control_center_method_click_by_attr("Btn_保存") - def dde_method_reset_account_password_from_change_password_by_control_center(self): + def dde_method_reset_current_account_password_from_change_password_by_control_center(self): + """在控制中心中将修改的当前用户密码重置为修改前的密码""" self.dde_control_center_method_click_by_attr("Btn_修改密码") self.dde_control_center_method_click_by_attr("Editable_oldpasswordedit") pylinuxauto.input_message(BaseMethod.change_password) @@ -144,6 +146,30 @@ class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod): pylinuxauto.input_message(BaseMethod.account_massage) self.dde_control_center_method_click_by_attr("Btn_保存") + def dde_method_change_other_account_password_by_control(self): + """在控制中心中修改非当前用户密码""" + self.dde_control_center_method_click_reset_password_btn_by_attr() + self.dde_control_center_method_click_by_attr("Editable_newpasswordedit") + pylinuxauto.input_message(BaseMethod.change_password) + sleep(3) + self.dde_control_center_method_click_by_attr("Editable_repeatpasswordedit") + pylinuxauto.input_message(BaseMethod.change_password) + sleep(3) + self.dde_control_center_method_click_by_attr("Btn_保存") + sleep(5) + + def dde_method_reset_other_account_password_from_change_password_by_control_center(self): + """在控制中心中将修改的非当前用户密码重置为修改前的密码（该方法主要用于对修改密码的重置，修改密码方法包含鉴权，因此本方法内无鉴权操作）""" + self.dde_control_center_method_click_reset_password_btn_by_attr() + self.dde_control_center_method_click_by_attr("Editable_newpasswordedit") + pylinuxauto.input_message(BaseMethod.account_massage) + sleep(3) + self.dde_control_center_method_click_by_attr("Editable_repeatpasswordedit") + pylinuxauto.input_message(BaseMethod.account_massage) + sleep(3) + self.dde_control_center_method_click_by_attr("Btn_保存") + if __name__ == "__main__": - DdeMethod().dde_method_add_root_account_by_control_center() + sleep(3) + DdeMethod().dde_method_reset_other_account_password_from_change_password_by_control_center() diff --git a/method/image_res/system_manager_in_all_categories_view.png b/method/image_res/system_manager_in_all_categories_view.png new file mode 100644 index 0000000000000000000000000000000000000000..d45f79b244c873eca5ec5b40c2e5e2583de0a61e GIT binary patch literal 1566 zcmV+(2I2XMP)eHZY=M#pogkHyI84Lq&gvOIWdyCbpbYkMDPJ z=tb22L4EOk{jSdWo##By^LwA?9FMF(AOQbUu>W)dzY%}8Hkzhsn*JA3`Q`YIHiVEy zqj~V)LEhDPJZ?6dqtWPx4<7))X0ru@!Aye}FJ2rta3GydwnclLn=-b)|f~c>rzj*OtRaF&15Lv6EqoYrrJV6LmR#r|- zOx(YJf6JCF%qmUOH*ek?8yjnAXaE3#Kp>OJd_JF2sl*04o$k$>HwJ?NPn(*W91cfT zi1G39qN1Yi?rw|4f*FUy@&5gLqtS?`27{rcrR7Jp-MV$_@ZrN*VDl01+8XC&V${s&{JTo)%>eVZ^+wF8ZSFKtlm&=QbiF{_OMlZrr$GHk&a?({x)~n@Xjssi`R_C?HAl-o1M* zEiI28J?ii8KYjXimXp`7UoTp;sIjr}?c2AQ`Sj@%La4B?kg>Ua`?gRhjKyM%w%Xd- zEI+tzmoHyt>UQ$v$@%$tCb6HZn?N8C2n1WVZnfELp-@OFl>)%?=g+67r)z6#Ns`2= zV~?Rw$l-8!yljzbWU{-vyR@`4D?}s`*|>2d04yvlL?RK)Boc}0 z>gt}Jo~u`{u3WiNE|)VKo12@}YBd0ij*gx`fBxFFYhtl@WMo9E)s~f&?lh?fvT(P*@yqN2CAci+B!xqHu^J*!YC0HCk0Z((5pe|3zZp`ma% z+}hfTr{C?#!otF2GU@etj~+d0u~@3Bt7)3&XO<$6K;w2_AE~T#-mrR8*8@)7I9OS+~3x z9v%(^0#~kFVVL8`j|0H<>(?hICkF-w0KjB2nM@{%qUPr2D2l>ndcFSGv17Y;@BRsG z;c&R8r^n;*SS%JUm#fq19zJ}iR;#~uw7!8eXU=qWb!9T4Q0VU6yQQV26B84IgM)lN z|K-b-7L&wOUuKSbjSy<56;DgH)3 zg1Nc5cswo^i=)vfi^WQ%QUpN=g~CWA!r^chFJ7E?*KgPM2l03RfBWy^ADZLY#;oPE Qt^fc407*qoM6N<$f=u`b;{X5v literal 0 HcmV?d00001 -- Gitee