diff --git a/case/assert_res/test_dde_1270985_1.png b/case/assert_res/test_dde_1270985_1.png new file mode 100644 index 0000000000000000000000000000000000000000..a41be67fce46d2fd8fe468cac746981aab11e9aa Binary files /dev/null and b/case/assert_res/test_dde_1270985_1.png differ diff --git a/case/assert_res/test_dde_1270989_1.png b/case/assert_res/test_dde_1270989_1.png new file mode 100644 index 0000000000000000000000000000000000000000..bb7addc51874d53197bb30f3506064bea7c8f889 Binary files /dev/null and b/case/assert_res/test_dde_1270989_1.png differ diff --git a/case/assert_res/test_dde_1270989_2.png b/case/assert_res/test_dde_1270989_2.png new file mode 100644 index 0000000000000000000000000000000000000000..89f2b1b11ca3736166b632e8c6840da86e39c410 Binary files /dev/null and b/case/assert_res/test_dde_1270989_2.png differ diff --git a/case/assert_res/test_dde_1271005.png b/case/assert_res/test_dde_1271005.png new file mode 100644 index 0000000000000000000000000000000000000000..688e5b322e094189bcc9618d95e3aeb83e312345 Binary files /dev/null and b/case/assert_res/test_dde_1271005.png differ diff --git a/case/assert_res/test_dde_1271009.png b/case/assert_res/test_dde_1271009.png new file mode 100644 index 0000000000000000000000000000000000000000..3737bbbc22c28a07c83ef0c2455f57657f58f540 Binary files /dev/null and b/case/assert_res/test_dde_1271009.png differ diff --git a/case/assert_res/test_dde_1271011.png b/case/assert_res/test_dde_1271011.png new file mode 100644 index 0000000000000000000000000000000000000000..292eff36ea24d2e091784437bedf6d5f9a2c3c8f Binary files /dev/null and b/case/assert_res/test_dde_1271011.png differ diff --git a/case/assert_res/test_euler_1271033_1.png b/case/assert_res/test_dde_1271033_1.png similarity index 100% rename from case/assert_res/test_euler_1271033_1.png rename to case/assert_res/test_dde_1271033_1.png diff --git a/case/assert_res/test_euler_1271033_2.png b/case/assert_res/test_dde_1271033_2.png similarity index 100% rename from case/assert_res/test_euler_1271033_2.png rename to case/assert_res/test_dde_1271033_2.png diff --git a/case/assert_res/test_euler_1271035_1.png b/case/assert_res/test_dde_1271035_1.png similarity index 100% rename from case/assert_res/test_euler_1271035_1.png rename to case/assert_res/test_dde_1271035_1.png diff --git a/case/assert_res/test_euler_1271035_2.png b/case/assert_res/test_dde_1271035_2.png similarity index 100% rename from case/assert_res/test_euler_1271035_2.png rename to case/assert_res/test_dde_1271035_2.png diff --git a/case/assert_res/test_euler_1271037.png b/case/assert_res/test_dde_1271037.png similarity index 100% rename from case/assert_res/test_euler_1271037.png rename to case/assert_res/test_dde_1271037.png diff --git a/case/assert_res/test_euler_1271301.png b/case/assert_res/test_dde_1271301.png similarity index 100% rename from case/assert_res/test_euler_1271301.png rename to case/assert_res/test_dde_1271301.png diff --git a/case/assert_res/test_euler_1271309.png b/case/assert_res/test_dde_1271309.png similarity index 100% rename from case/assert_res/test_euler_1271309.png rename to case/assert_res/test_dde_1271309.png diff --git a/case/assert_res/test_euler_1271311.png b/case/assert_res/test_dde_1271311.png similarity index 100% rename from case/assert_res/test_euler_1271311.png rename to case/assert_res/test_dde_1271311.png diff --git a/case/assert_res/test_euler_1271313_1.png b/case/assert_res/test_dde_1271313_1.png similarity index 100% rename from case/assert_res/test_euler_1271313_1.png rename to case/assert_res/test_dde_1271313_1.png diff --git a/case/assert_res/test_euler_1271313_2.png b/case/assert_res/test_dde_1271313_2.png similarity index 100% rename from case/assert_res/test_euler_1271313_2.png rename to case/assert_res/test_dde_1271313_2.png diff --git a/case/test_dde_1271011.py b/case/test_dde_1271011.py new file mode 100644 index 0000000000000000000000000000000000000000..f1ae3a7dd7cfc3101d68278348a37f2f501683b6 --- /dev/null +++ b/case/test_dde_1271011.py @@ -0,0 +1,19 @@ +from case.base_case import BaseCase +from method.dde_method import DdeMethod +from youqu3 import sleep +from method.dde_control_center_method import DdeControlCenterMethod + + +class TestDdeCase(BaseCase): + def test_dde_1271011(self): + """控制中心中更改屏幕分辨率后默认选中当前分辨率推荐的刷新率""" + DdeMethod().dde_dock_method_click_control_center_btn_by_attr() + sleep(6) + DdeMethod().dde_method_change_resolution_by_control_center() + self.assert_element_exist("/dde-control-center/59.81赫兹") + self.assert_image_exist_in_dde("test_dde_1271011.png") + + def teardown_method(self): + """将分辨率重置，关闭控制中心窗口""" + DdeMethod().dde_method_reset_resolution_by_control_center() + DdeMethod().dde_method_close_window() diff --git a/case/test_dde_1271033.py b/case/test_dde_1271033.py index 9d68f814aa138a2242cd1694092c80116296a394..44c4e51a5d4172f0e4842e77bc83bb10e46215ae 100644 --- a/case/test_dde_1271033.py +++ b/case/test_dde_1271033.py @@ -10,8 +10,8 @@ class TestDdeCase(BaseCase): 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") + self.assert_image_exist_in_dde("test_dde_1271033_1") + self.assert_image_exist_in_dde("test_dde_1271033_2") def teardown_method(self): """关闭控制中心窗口""" diff --git a/case/test_dde_1271035.py b/case/test_dde_1271035.py index 9a996fa28b4888e9b908bac7e9802af0db124466..14c2fa8a18c6c14d1564f0336fa3e58628fbe0a9 100644 --- a/case/test_dde_1271035.py +++ b/case/test_dde_1271035.py @@ -6,12 +6,12 @@ class TestDdeCase(BaseCase): 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") + self.assert_image_exist_in_dde("test_dde_1271035_1.png") 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") + self.assert_image_exist_in_dde("test_dde_1271035_2.png") def teardown_method(self): """删除新增账户并且关闭控制中心""" diff --git a/case/test_dde_1271037.py b/case/test_dde_1271037.py index d37305642c73b6f731b9644f4a4893cd924e1be2..e2fce638749f5068dc8ef418162da7c98e00f0e7 100644 --- a/case/test_dde_1271037.py +++ b/case/test_dde_1271037.py @@ -16,7 +16,7 @@ class TestDdeCase(BaseCase): sleep(3) pylinuxauto.enter() sleep(3) - self.assert_image_not_exist_in_dde("test_euler_1271037.png") + self.assert_image_not_exist_in_dde("test_dde_1271037.png") def teardown_method(self): """将修改的当前账户密码重新设置为之前的密码""" diff --git a/case/test_dde_1271301.py b/case/test_dde_1271301.py index 469505841714d35826dc91435dfec2a26a7bbd79..03b77d9f831d4ce6063583845cad5168057941e5 100644 --- a/case/test_dde_1271301.py +++ b/case/test_dde_1271301.py @@ -8,7 +8,7 @@ class TestDdeCase(BaseCase): 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") + self.assert_image_exist_in_dde("test_dde_1271301.png") def teardown_method(self): """环境清理，将新增的汉语键盘布局删除""" diff --git a/method/dde_control_center_method.py b/method/dde_control_center_method.py index 672ebb9143a74d705e184ed36503bcdf85671db5..6097cfdf8b23ad685837ae12be85aa6160225e19 100644 --- a/method/dde_control_center_method.py +++ b/method/dde_control_center_method.py @@ -67,6 +67,18 @@ class DdeControlCenterMethod(BaseMethod): self.dde_control_center_method_click_by_attr("Editable_dspinboxchilddlineedit") pylinuxauto.enter() + def dde_control_center_method_click_add_dsl_btn(self): + """在网络的dsl视图中点击添加按钮""" + self.dde_control_center_method_click_by_attr("Btn_创建pppoe连接") + + def dde_control_center_method_click_time_synchronization_btn_by_attr(self): + """在控制中心的 时间设置 模块点击 时间同步 按钮""" + self.dde_control_center_method_click_by_attr("Btn_自动同步配置") + + def dde_control_center_method_click_time_setting_by_attr(self): + """在时间与日期模块中点击 时间设置""" + self.dde_control_center_method_click_by_attr("时间设置") + if __name__ == "__main__": sleep(3) diff --git a/method/dde_method.py b/method/dde_method.py index 34c072c1f58c88abb096feaf1a138d25816e2510..071a40e7a7d79859f4fa675e8df04e463491c0c2 100644 --- a/method/dde_method.py +++ b/method/dde_method.py @@ -84,6 +84,7 @@ class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod): pylinuxauto.input_message(self.account_massage) sleep(3) self.dde_control_center_method_click_by_attr("Btn_创建") + sleep(1) pylinuxauto.input_message(self.account_massage) sleep(3) pylinuxauto.enter() @@ -111,6 +112,7 @@ class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod): pylinuxauto.input_message(self.account_massage) sleep(3) self.dde_control_center_method_click_by_attr("Btn_创建") + sleep(1) pylinuxauto.input_message(self.account_massage) sleep(3) pylinuxauto.enter() @@ -159,7 +161,7 @@ class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod): 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) @@ -169,7 +171,80 @@ class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod): sleep(3) self.dde_control_center_method_click_by_attr("Btn_保存") + def dde_method_change_resolution_by_control_center(self): + """在控制中心中修改屏幕分辨率""" + self.dde_control_center_enter_view_by_search_box("xianshi") + self.dde_control_center_method_click_by_attr("1920×1080") + self.dde_control_center_method_click_by_attr("1280×800") + sleep(1) + self.dde_control_center_method_click_by_attr("Btn_保存") + sleep(2) + + def dde_method_reset_resolution_by_control_center(self): + """在控制中心中将修改的分辨率调回1920x1080""" + self.dde_control_center_method_click_by_attr("1280×800") + self.dde_control_center_method_click_by_attr("1920×1080") + sleep(1) + self.dde_control_center_method_click_by_attr("Btn_保存") + sleep(2) + + def dde_method_add_network_dsl_by_control_center(self): + """在控制中心的 网络 模块中添加DSL""" + self.dde_control_center_enter_view_by_search_box("dsl") + self.dde_control_center_method_click_add_dsl_btn() + self.dde_control_center_method_click_by_attr("Btn_自动连接") + self.dde_control_center_method_click_by_attr("Editable_用户名") + pylinuxauto.input_message("test") + sleep(2) + self.dde_control_center_method_click_by_attr("Editable_密码") + pylinuxauto.input_message(BaseMethod.account_massage) + sleep(3) + self.dde_control_center_method_click_by_attr("Btn_保 存") + + def dde_method_delete_network_dsl_by_control_center(self): + """在控制中心的网络DSL模块中删除添加的测试DSL连接""" + self.dde_method_click_by_img("dsl_connection_details_btn.png") + self.dde_control_center_method_click_by_attr("Btn_删 除") + sleep(1) + self.dde_control_center_method_click_by_attr("Btn_删 除_1") + sleep(2) + + def dde_method_change_time_by_control_center(self): + """在控制中心中手动修改时间""" + self.dde_control_center_enter_view_by_search_box("shijianshezhi") + self.dde_control_center_method_click_time_synchronization_btn_by_attr() + self.dde_control_center_method_click_by_attr("TIME_HOUR_WIDGET") + pylinuxauto.backspace() + pylinuxauto.backspace() + pylinuxauto.input_message("12") + sleep(2) + self.dde_control_center_method_click_by_attr("TIME_MIN_WIDGET") + pylinuxauto.backspace() + pylinuxauto.backspace() + pylinuxauto.input_message("12") + sleep(2) + self.dde_control_center_method_click_by_attr("Btn_确定") + + def dde_method_change_time_area_by_control_center(self): + """在控制中心中更改时区""" + self.dde_control_center_method_click_by_attr("时间日期") + self.dde_control_center_method_click_by_attr("时区列表") + self.dde_control_center_method_click_by_attr("Btn_修改系统时区") + sleep(2) + self.dde_control_center_method_click_by_attr("Editable_qlineedit") + pylinuxauto.input_message("New_York") + sleep(2) + pylinuxauto.enter() + self.dde_control_center_method_click_by_attr("Btn_确定") + sleep(2) + + def dde_control_center_method_delete_other_time_area_by_control_center(self): + """删除时区列表多余的一个时区""" + self.dde_control_center_method_click_by_attr("Btn_时区列表") + self.dde_control_center_click_delete_btn_by_img() + sleep(1) + if __name__ == "__main__": sleep(3) - DdeMethod().dde_method_reset_other_account_password_from_change_password_by_control_center() + DdeMethod().dde_control_center_method_click_by_attr("Btn_时区列表") diff --git a/method/image_res/close_window_btn.png b/method/image_res/close_window_btn.png index fd0dc5fe7e2499cca7b31c347d0d750f404d1b8a..6b6bdbd9a33577bc1be845c87a1da862855616d0 100644 Binary files a/method/image_res/close_window_btn.png and b/method/image_res/close_window_btn.png differ diff --git a/method/image_res/dsl_connection_details_btn.png b/method/image_res/dsl_connection_details_btn.png new file mode 100644 index 0000000000000000000000000000000000000000..bb2f98970186989ed9f005005890df7378508b82 Binary files /dev/null and b/method/image_res/dsl_connection_details_btn.png differ