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 60e6b1cac9890d9fae55401409af845851a2b5d2..9d68f814aa138a2242cd1694092c80116296a394 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 e14455f03e4f58525e3ffdaf286f734f90eade6b..9a996fa28b4888e9b908bac7e9802af0db124466 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 0000000000000000000000000000000000000000..d37305642c73b6f731b9644f4a4893cd924e1be2 --- /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 5f161819ee32e0f98993230828c947ef4b173ca0..469505841714d35826dc91435dfec2a26a7bbd79 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 4b7e32b23107aa518446ca6561f0a5f683d8044c..672ebb9143a74d705e184ed36503bcdf85671db5 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 3165832fc13b12ae6d1d248d289aa9923e51333b..6b4fd255ca7af4bfbc4a84f1b02e2c739972fd7e 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 da9e567d20f618f881b211300cc8d127dae37d24..34c072c1f58c88abb096feaf1a138d25816e2510 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 Binary files /dev/null and b/method/image_res/system_manager_in_all_categories_view.png differ