diff --git a/case/assert_res/test_euler_1271033_1.png b/case/assert_res/test_euler_1271033_1.png new file mode 100644 index 0000000000000000000000000000000000000000..6ea4e75da0e76a4976f5ef3e034980f0a6629e24 Binary files /dev/null and b/case/assert_res/test_euler_1271033_1.png differ diff --git a/case/assert_res/test_euler_1271033_2.png b/case/assert_res/test_euler_1271033_2.png new file mode 100644 index 0000000000000000000000000000000000000000..dfddb1eae97601817262e4cbe027da10ca7f49ed Binary files /dev/null and b/case/assert_res/test_euler_1271033_2.png differ diff --git a/case/assert_res/new_account.png b/case/assert_res/test_euler_1271035_1.png similarity index 100% rename from case/assert_res/new_account.png rename to case/assert_res/test_euler_1271035_1.png diff --git a/case/assert_res/test_euler_1271035_2.png b/case/assert_res/test_euler_1271035_2.png new file mode 100644 index 0000000000000000000000000000000000000000..fdef5d27bbfaa16f5b16510b4894bb5b064868ba Binary files /dev/null and b/case/assert_res/test_euler_1271035_2.png differ diff --git a/case/assert_res/test_euler_1271037.png b/case/assert_res/test_euler_1271037.png new file mode 100644 index 0000000000000000000000000000000000000000..e8773d94a3beaa4b623050d75cfb8fd365430998 Binary files /dev/null and b/case/assert_res/test_euler_1271037.png differ diff --git a/case/assert_res/keyboard_layout_hanyu.png b/case/assert_res/test_euler_1271301.png similarity index 100% rename from case/assert_res/keyboard_layout_hanyu.png rename to case/assert_res/test_euler_1271301.png diff --git a/case/test_euler_1271033.py b/case/test_euler_1271033.py new file mode 100644 index 0000000000000000000000000000000000000000..60e6b1cac9890d9fae55401409af845851a2b5d2 --- /dev/null +++ b/case/test_euler_1271033.py @@ -0,0 +1,19 @@ +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): + """在删除账户(当前登陆)""" + DdeMethod().dde_dock_method_click_control_center_btn_by_attr() + 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") + + def teardown_method(self): + """关闭控制中心窗口""" + DdeMethod().dde_method_close_window() diff --git a/case/test_euler_1271041.py b/case/test_euler_1271035.py similarity index 41% rename from case/test_euler_1271041.py rename to case/test_euler_1271035.py index 7d4bb9e5e1a61ce0fb09f304f96586d1cce0f39e..e14455f03e4f58525e3ffdaf286f734f90eade6b 100644 --- a/case/test_euler_1271041.py +++ b/case/test_euler_1271035.py @@ -3,10 +3,15 @@ from method.dde_method import DdeMethod class TestDdeCase(BaseCase): - def test_euler_1271041(self): - """在控制中心中新建账户""" - DdeMethod().dde_method_add_account_by_control_center() - self.assert_image_exist_in_dde("new_account.png") + def test_euler_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): + """在控制中心中新建管理员账户""" + DdeMethod().dde_method_add_root_account_by_control_center() + self.assert_image_exist_in_dde("test_euler_1271035_2.png") def teardown_method(self): """删除新增账户并且关闭控制中心""" diff --git a/case/test_euler_1271301.py b/case/test_euler_1271301.py index ca52d8918688be10933ba3ee2f8511645cf853ed..5f161819ee32e0f98993230828c947ef4b173ca0 100644 --- a/case/test_euler_1271301.py +++ b/case/test_euler_1271301.py @@ -8,7 +8,7 @@ class TestDdeCase(BaseCase): def test_euler_1271301(self): """在控制中心中添加汉语键盘布局""" DdeMethod().dde_method_add_hanyu_keyboard_layout_in_control_center() - self.assert_image_exist_in_dde("keyboard_layout_hanyu.png") + self.assert_image_exist_in_dde("test_euler_1271301.png") def teardown_method(self): """环境清理，将新增的汉语键盘布局删除""" diff --git a/method/base_method.py b/method/base_method.py index 624cc6707c66abd74994252753abaac48d361ddf..c6aac0670e7c3313cffbba4873f3c215806287b8 100644 --- a/method/base_method.py +++ b/method/base_method.py @@ -15,6 +15,7 @@ from config import config class BaseMethod: dde_control_center_path = "/dde-control-center" account_massage = "uostest12#$" + change_password = "testpass12#$" """应用的方法基类""" diff --git a/method/dde_control_center_method.py b/method/dde_control_center_method.py index eeddd8c9d83783a6cb27c596ed7cfd968e64f443..4b7e32b23107aa518446ca6561f0a5f683d8044c 100644 --- a/method/dde_control_center_method.py +++ b/method/dde_control_center_method.py @@ -48,11 +48,16 @@ class DdeControlCenterMethod(BaseMethod): pylinuxauto.input_message(view_name) sleep(3) pylinuxauto.enter() + sleep(1) def dde_control_center_method_click_edit_btn_in_system_language(self): """点击 系统语言 列表旁边的编辑按钮""" self.dde_control_center_method_click_by_attr("Btn_dcommandlinkbutton") + def dde_control_center_method_click_automatic_login_btn_by_attr(self): + """点击 账户 视图下的 自动登录 按钮""" + self.dde_control_center_method_click_by_attr("Btn_自动登录") + if __name__ == "__main__": sleep(3) diff --git a/method/dde_method.py b/method/dde_method.py index 422016a3e6a7c77599dfe41ffe79af7a41949cbe..da9e567d20f618f881b211300cc8d127dae37d24 100644 --- a/method/dde_method.py +++ b/method/dde_method.py @@ -9,6 +9,7 @@ from time import sleep from funnylog2.config import config as funnylog2_config from config import config +from method.base_method import BaseMethod funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"] from youqu3 import log @@ -62,7 +63,7 @@ class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod): self.dde_control_center_method_click_edit_btn_in_system_language() self.dde_control_center_click_delete_btn_by_img() - def dde_method_add_account_by_control_center(self): + def dde_method_add_common_account_by_control_center(self): """在控制中心中添加新的账户 test""" self.dde_dock_method_click_control_center_btn_by_attr() sleep(6) @@ -88,9 +89,61 @@ class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod): pylinuxauto.enter() sleep(5) + def dde_method_add_root_account_by_control_center(self): + """在控制中心中添加新的账户 test""" + self.dde_dock_method_click_control_center_btn_by_attr() + sleep(6) + self.dde_control_center_enter_view_by_search_box("zhanghu") + self.dde_control_center_method_click_by_attr("Btn_创建帐户") + self.dde_control_center_method_click_by_attr("标准用户") + self.dde_control_center_method_click_by_attr("管理员") + self.dde_control_center_method_click_by_attr("Editable_usernameedit") + pylinuxauto.input_message("test") + sleep(2) + pylinuxauto.tab() + pylinuxauto.input_message("test") + sleep(2) + pylinuxauto.tab() + pylinuxauto.input_message(self.account_massage) + sleep(3) + pylinuxauto.tab() + pylinuxauto.tab() + pylinuxauto.input_message(self.account_massage) + sleep(3) + self.dde_control_center_method_click_by_attr("Btn_创建") + pylinuxauto.input_message(self.account_massage) + sleep(3) + pylinuxauto.enter() + sleep(5) + def dde_method_delete_test_account_by_control_center(self): """在控制中心中将新添加的账户test删除""" self.dde_control_center_method_click_by_attr("test") self.dde_control_center_method_click_by_attr("Btn_删除帐户") self.dde_control_center_method_click_by_attr("Btn_删除") sleep(5) + + def dde_method_change_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") + pylinuxauto.input_message(BaseMethod.account_massage) + self.dde_control_center_method_click_by_attr("Editable_newpasswordedit") + pylinuxauto.input_message(BaseMethod.change_password) + self.dde_control_center_method_click_by_attr("Editable_repeatpasswordedit") + 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): + 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) + self.dde_control_center_method_click_by_attr("Editable_newpasswordedit") + pylinuxauto.input_message(BaseMethod.account_massage) + self.dde_control_center_method_click_by_attr("Editable_repeatpasswordedit") + pylinuxauto.input_message(BaseMethod.account_massage) + self.dde_control_center_method_click_by_attr("Btn_保存") + + +if __name__ == "__main__": + DdeMethod().dde_method_add_root_account_by_control_center()