diff --git a/case/test_dde_1271159.py b/case/test_dde_1271159.py index 6d27ba9a6720bdf8182c6563f1d8b34777d2af51..a4e88377f5ef2353304a66479f2c1b42d4b420ec 100644 --- a/case/test_dde_1271159.py +++ b/case/test_dde_1271159.py @@ -1,8 +1,6 @@ from src import sleep from apps.dde_autotest_euler.case.base_case import BaseCase from apps.dde_autotest_euler.method.dde_method import DdeMethod -from src import Src -from setting import conf class TestDdeCase(BaseCase): diff --git a/case/test_dde_1271175.py b/case/test_dde_1271175.py index fe9da60a1061b746cac9c51fb34d87017059ff40..649786e21789c578d74e9cfb3ab7d53de16a1a6f 100644 --- a/case/test_dde_1271175.py +++ b/case/test_dde_1271175.py @@ -7,7 +7,7 @@ from apps.dde_autotest_euler.method.dde_method import DdeMethod class TestDdeCase(BaseCase): - def test_dde_1271175(self, clear_file_in_home_and_kill_process): + def test_dde_1271175(self): """系统监视器-重启系统服务""" euler = DdeMethod() euler.open_software_by_launcher("xitongjianshiqi") @@ -22,7 +22,7 @@ class TestDdeCase(BaseCase): Src.enter() self.assert_ocr_exist("已启动") - @pytest.fixture + @pytest.fixture(autouse=True) def clear_file_in_home_and_kill_process(self): """关闭进程""" yield diff --git a/case/test_dde_1271199.py b/case/test_dde_1271199.py index 6d0b9e149c7bf48b04b4ccba777c4f9c2031fa34..4cbb622b2d342310f2a2f2643f8b1d7d17f46c60 100644 --- a/case/test_dde_1271199.py +++ b/case/test_dde_1271199.py @@ -1,9 +1,12 @@ +import pytest + from src import sleep from apps.dde_autotest_euler.case.base_case import BaseCase from apps.dde_autotest_euler.method.dde_method import DdeMethod class TestDdeCase(BaseCase): + def test_dde_1271199(self): """检查设备管理器的各模块信息显示""" euler = DdeMethod() @@ -24,10 +27,10 @@ class TestDdeCase(BaseCase): self.assert_ocr_exist("中断") sleep(1) euler.deepin_devicemanager.click_by_attr("音频适配器") - self.assert_ocr_exist("芯片") + self.assert_ocr_exist("时钟频率") sleep(1) euler.deepin_devicemanager.click_by_attr("存储设备") - self.assert_ocr_exist("设备文件") + self.assert_ocr_exist("固件版本") sleep(1) euler.deepin_devicemanager.click_by_attr("鼠标") self.assert_ocr_exist("型号") @@ -38,7 +41,9 @@ class TestDdeCase(BaseCase): euler.deepin_devicemanager.click_by_attr("光驱") self.assert_ocr_exist("总线信息") - def teardown_method(self): + @pytest.fixture(autouse=True) + def clear(self): """通过命令关闭启动器""" DdeMethod().kill_process("deepin-devicemanager") - sleep(3) + yield + DdeMethod().kill_process("deepin-devicemanager") diff --git a/case/test_dde_1271201.py b/case/test_dde_1271201.py index 8c88bd57db287602a9d64d8220c28c89aadbcbe5..8d2ee77cc578f85d2aaa2312c79aa040b2c5ba04 100644 --- a/case/test_dde_1271201.py +++ b/case/test_dde_1271201.py @@ -5,6 +5,7 @@ from src import Src class TestDdeCase(BaseCase): + def test_dde_1271201(self): """检查设备管理器的设备信息导出""" euler = DdeMethod() @@ -13,8 +14,8 @@ class TestDdeCase(BaseCase): euler.export_file_by_attr("概况") euler.open_software_by_launcher("wenbenbianjiqi") sleep(6) - euler.deepin_editor.deepin_editor.click_menu_btn_by_attr() - euler.deepin_editor.deepin_editor.choose_open_file_option_by_ocr() + euler.deepin_editor.click_menu_btn_by_attr() + euler.deepin_editor.choose_open_file_option_by_ocr() euler.click_documents_in_pop_window_by_img() Src.ctrl_a() Src.enter() diff --git a/case/test_dde_1271213.py b/case/test_dde_1271213.py index e39f813f76952d01b5fdc653d808f83a2c4e705f..14cca5ec9ad95751718d7e5689f0a9c569d1f892 100644 --- a/case/test_dde_1271213.py +++ b/case/test_dde_1271213.py @@ -4,6 +4,7 @@ from src import sleep class TestDdeCase(BaseCase): + def test_dde_1271213_1(self): """在字体管理器中搜索字体名称""" DdeMethod().open_software_by_launcher("zitiguanli") diff --git a/case/test_dde_1271247.py b/case/test_dde_1271247.py index 5ba39c42aa0eb70206a502a3660f50c303855840..559020cb3a2d5fe6457a7ad674364d985d64179f 100644 --- a/case/test_dde_1271247.py +++ b/case/test_dde_1271247.py @@ -5,6 +5,7 @@ from src import Src class TestDdeCase(BaseCase): + def test_dde_1271247(self): """终端关闭""" app_name = "deepin-terminal" @@ -15,13 +16,14 @@ class TestDdeCase(BaseCase): sleep(1) DdeMethod().dde_dock.click_by_ocr("远程管理") sleep(1) - x, y = Src.ocrx("未添加").result + x, y = Src.ocr("未添加") Src.click(x - 150, y) self.assert_ocr_not_exist("未添加") - Src.alt_f4() sleep(1) self.assert_process_status(False, app_name) def teardown_method(self): Src.alt_f4() + DdeMethod().kill_process("deepin-terminal") + diff --git a/case/test_dde_1271293.py b/case/test_dde_1271293.py index 7358882b6f9babfb7eb261a941b9e4927691367d..8c11ab96e0273cfbb95a0b8d3062ca9526f659b2 100644 --- a/case/test_dde_1271293.py +++ b/case/test_dde_1271293.py @@ -6,6 +6,7 @@ from apps.dde_autotest_euler.method.vender.dde_dock_method import DdeDockMethod class TestDdeCase(BaseCase): + def test_dde_1271293(self): """查看系统信息—版本协议""" DdeDockMethod().click_control_center_btn_by_attr() diff --git a/case/test_dde_1271295.py b/case/test_dde_1271295.py index 202dff435963e44b305a9a6c9b56f1e4fd91dab3..9a506b6a40a87b00b2f82029f13614111ae54cc8 100644 --- a/case/test_dde_1271295.py +++ b/case/test_dde_1271295.py @@ -6,6 +6,7 @@ from apps.dde_autotest_euler.method.vender.dde_dock_method import DdeDockMethod class TestDdeCase(BaseCase): + def test_dde_1271295(self): """查看系统信息—版本协议""" DdeDockMethod().click_control_center_btn_by_attr() diff --git a/case/test_dde_1271297.py b/case/test_dde_1271297.py index 3200703b0c76ddc74c88e52330301236688c857a..d89c8712dd2ed4ddb34c649c57ce3b4cce68daec 100644 --- a/case/test_dde_1271297.py +++ b/case/test_dde_1271297.py @@ -15,4 +15,4 @@ class TestDdeCase(BaseCase): def teardown_method(self): """关闭控制中心""" - + DdeMethod().dde_control_center.kill_dde_control_center() diff --git a/case/test_dde_1271299.py b/case/test_dde_1271299.py index 23b2474f2cd5cf63da9924552920408670723726..52eab9c7cd6f01ae97bddf0dad2b7d039e49078f 100644 --- a/case/test_dde_1271299.py +++ b/case/test_dde_1271299.py @@ -7,7 +7,8 @@ class TestDdeCase(BaseCase): def test_dde_1271299(self): """添加系统语言""" DdeMethod().add_english_system_language_in_control_center() - self.assert_element_exist("$/dde-control-center//American English - 美国英语") + sleep(2) + self.assert_ocr_exist("语言列表", "美国英语") def teardown_method(self): """清理环境,将新增的系统语言删除""" diff --git a/case/test_dde_1271301.py b/case/test_dde_1271301.py index 61abc3645875665513afdebf1808a7464313d216..dc99eafa38d72c14e8ffb7dcb7e7bd55395f4256 100644 --- a/case/test_dde_1271301.py +++ b/case/test_dde_1271301.py @@ -7,6 +7,7 @@ class TestDdeCase(BaseCase): def test_dde_1271301(self): """在控制中心中添加汉语键盘布局""" DdeMethod().add_hanyu_keyboard_layout_in_control_center() + sleep(2) self.assert_ocr_exist("汉语") def teardown_method(self): diff --git a/case/test_dde_1271309.py b/case/test_dde_1271309.py index cf65250393923d05766318932b0ec2262d1b03af..b219414a409338bfdd7abb59624753142bc1ff75 100644 --- a/case/test_dde_1271309.py +++ b/case/test_dde_1271309.py @@ -1,3 +1,5 @@ +import pytest + from apps.dde_autotest_euler.case.base_case import BaseCase from src import sleep from apps.dde_autotest_euler.method.dde_method import DdeMethod @@ -5,6 +7,7 @@ from src import Src class TestDdeCase(BaseCase): + def test_dde_1271309_1(self): """在任务栏中打开启动器""" euler = DdeMethod() @@ -12,19 +15,22 @@ class TestDdeCase(BaseCase): sleep(1) # 等待 1 秒,判断launcher是否启动 self.assert_image_exist_in_dde("test_dde_1271309.png") - DdeMethod().kill_process("dde-launcher") - sleep(3) - self.assert_image_not_exist_in_dde("test_dde_1271309.png") - sleep(3) def test_dde_1271309_2(self): """在任务栏中打开启动器""" - Src.win_left() - sleep(1) + Src.press_key("win") + sleep(10) # 等待 1 秒,判断launcher是否启动 self.assert_image_exist_in_dde("test_dde_1271309.png") - sleep(3) - Src.win_left() + Src.press_key("win") sleep(1) self.assert_image_not_exist_in_dde("test_dde_1271309.png") + + @pytest.fixture(autouse=True) + def clear(self): + DdeMethod().click_restore() + sleep(1) + yield + DdeMethod().click_restore() + sleep(2) diff --git a/case/test_dde_1271311.py b/case/test_dde_1271311.py index 06b10761a0e1d93ca519b66dfba464f3ab59be14..96551b8e7ce5bbf6f12fe28cf6d06718163ffb4d 100644 --- a/case/test_dde_1271311.py +++ b/case/test_dde_1271311.py @@ -17,9 +17,8 @@ class TestDdeCase(BaseCase): euler.open_software_by_launcher("Firefox") # 等待 10 秒,判断browser是否启动 sleep(10) - self.assert_image_exist_in_dde("test_dde_1271311.png") + self.assert_process_status(True, "firefox") def teardown_method(self): """环境清理,关闭火狐浏览器""" - DdeMethod().browser.kill_process("Firefox") - sleep(3) + DdeMethod().kill_process("firefox") diff --git a/case/test_dde_1271313.py b/case/test_dde_1271313.py index 26d598111a6e2e988e5a64cc48e3838d9aea8519..24b05d02de65ccdf9969c7036a8573b943bbd4ec 100644 --- a/case/test_dde_1271313.py +++ b/case/test_dde_1271313.py @@ -4,6 +4,7 @@ :Author:uos :Date :2024/08/22 13:15:47 """ +import pytest from apps.dde_autotest_euler.case.base_case import BaseCase from src import sleep @@ -25,14 +26,17 @@ class TestDdeCase(BaseCase): def test_dde_1271313_2(self): """通过按键win打开启动器""" sleep(2) - Src.win_left() + Src.press_key("win") # 等待 1 秒,判断launcher是否启动 sleep(1) self.assert_ocr_exist("搜索") sleep(1) - def teardown_method(self): - """通过命令关闭启动器""" - DdeMethod().kill_process("dde-launcher") - sleep(3) + @pytest.fixture(autouse=True) + def clear(self): + DdeMethod().click_restore() + sleep(1) + yield + DdeMethod().click_restore() + sleep(2) diff --git a/case/test_dde_1271315.py b/case/test_dde_1271315.py index 910c18aef88f6b2507f783a6cc55ce707efa8b5d..060cdca356c3b06aadef1e86c1e6d2c2aa80a1eb 100644 --- a/case/test_dde_1271315.py +++ b/case/test_dde_1271315.py @@ -4,6 +4,7 @@ :Author:uos :Date :2024/08/22 13:15:47 """ +import pytest from apps.dde_autotest_euler.case.base_case import BaseCase from src import sleep @@ -21,9 +22,14 @@ class TestDdeCase(BaseCase): sleep(1) self.assert_ocr_exist("搜索") sleep(1) - DdeMethod().click_by_img("launcher_power_btn.png") + DdeMethod().dde_dock.click_by_img("launcher_power_btn.png") sleep(1) self.assert_ocr_exist("关机") - Src.click(10, 10) - euler.click_restore() + + @pytest.fixture(autouse=True) + def clear(self): + DdeMethod().click_restore() sleep(1) + yield + DdeMethod().click_restore() + sleep(2) diff --git a/case/test_dde_1271317.py b/case/test_dde_1271317.py index de45f874bd284ca94877d1c20efb0fd5fafdc112..3ad73fa3cb3185b1dfdded2ee41755e555b2f511 100644 --- a/case/test_dde_1271317.py +++ b/case/test_dde_1271317.py @@ -1,3 +1,5 @@ +import pytest + from apps.dde_autotest_euler.case.base_case import BaseCase from src import sleep from apps.dde_autotest_euler.method.dde_method import DdeMethod @@ -29,7 +31,10 @@ class TestDdeCase(BaseCase): sleep(3) self.assert_ocr_exist("系统监视器") - def teardown_method(self): - """通过命令关闭启动器""" - DdeMethod().kill_process("dde-launcher") - sleep(3) + @pytest.fixture(autouse=True) + def clear(self): + DdeMethod().click_restore() + sleep(1) + yield + DdeMethod().click_restore() + sleep(2) diff --git a/case/test_dde_1271319.py b/case/test_dde_1271319.py index cfdd23fcc78b9b4b8645c1ab9d2ecbb27a1d1f47..324eca6d03d5035c08f2dc94ea803401382b0c78 100644 --- a/case/test_dde_1271319.py +++ b/case/test_dde_1271319.py @@ -1,3 +1,5 @@ +import pytest + from src import sleep from src import Src from apps.dde_autotest_euler.case.base_case import BaseCase @@ -5,6 +7,7 @@ from apps.dde_autotest_euler.method.dde_method import DdeMethod class TestDdeCase(BaseCase): + def test_dde_1271319_1(self): """任务栏-应用区域的添加&移除""" euler = DdeMethod() @@ -32,7 +35,7 @@ class TestDdeCase(BaseCase): sleep(2) euler.dde_launcher.right_click_by_attr("看图") Src.select_menu(3) - Src.win_left() + Src.press_key("win") sleep(2) self.assert_element_exist("$/dde-dock//Btn_看图") euler.dde_dock.right_click_by_attr("Btn_看图") @@ -40,7 +43,10 @@ class TestDdeCase(BaseCase): sleep(2) self.assert_element_not_exist("$/dde-dock//Btn_看图") - def teardown_method(self): - """通过命令关闭启动器""" - DdeMethod().kill_process("dde-launcher") - sleep(3) + @pytest.fixture(autouse=True) + def clear(self): + DdeMethod().click_restore() + sleep(1) + yield + DdeMethod().click_restore() + sleep(2) diff --git a/case/test_dde_1271321.py b/case/test_dde_1271321.py index 005636865262e85b22f75394ebde8cb910e58498..bc18e091c040fd1f419a2bba64122a60df067c6a 100644 --- a/case/test_dde_1271321.py +++ b/case/test_dde_1271321.py @@ -25,9 +25,10 @@ class TestDdeCase(BaseCase): sleep(1) euler.dde_dock.right_click_datetime_icon_by_attr() Src.select_menu(2) - sleep(2) + sleep(3) self.assert_ocr_exist("时间日期") def teardown_method(self): """通过命令关闭控制中心窗口""" DdeMethod().kill_process("dde-calendar") + DdeMethod().kill_process("dde-control-center") diff --git a/case/test_dde_1271327.py b/case/test_dde_1271327.py index 003fd2d2723df407476d2f30d8152718ddb17a9e..e4a5a36ab352c7fc5255e626867f2249f31549d9 100644 --- a/case/test_dde_1271327.py +++ b/case/test_dde_1271327.py @@ -1,4 +1,8 @@ import time + +import pytest + +from apps.dde_autotest_euler.method.dde_method import DdeMethod from src import Src from apps.dde_autotest_euler.case.base_case import BaseCase @@ -8,17 +12,26 @@ class TestDdeCase(BaseCase): def test_dde_1271327_1(self): """快捷键关闭剪贴板""" Src.hot_key("ctrl", "alt", "v") - time.sleep(2) + time.sleep(3) self.assert_ocr_exist("剪贴板") Src.hot_key("ctrl", "alt", "v") - time.sleep(2) + time.sleep(3) self.assert_ocr_not_exist("剪贴板") def test_dde_1271327_2(self): """点击空白处关闭剪贴板""" Src.hot_key("ctrl", "alt", "v") - time.sleep(2) + time.sleep(3) self.assert_ocr_exist("剪贴板") Src.click(1000, 500) - time.sleep(2) + time.sleep(3) self.assert_ocr_not_exist("剪贴板") + + @pytest.fixture(autouse=True) + def clear(self): + DdeMethod().click_restore() + time.sleep(1) + yield + DdeMethod().click_restore() + time.sleep(2) + diff --git a/case/test_dde_1271331.py b/case/test_dde_1271331.py index a816d3a57480806e3225653e2e4f14bdac436bda..a069dc230f7948516881d244e3b14991d0b365e4 100644 --- a/case/test_dde_1271331.py +++ b/case/test_dde_1271331.py @@ -20,4 +20,3 @@ class TestDdeCase(BaseCase): def teardown_method(self): """关闭窗口""" DdeMethod().kill_process("deepin-terminal") - time.sleep(2) diff --git a/method/dde_method.py b/method/dde_method.py index c7af39c4b4018d9ae50196a25471f00e061a5bde..f13f5893fad31cab73a0a68429cd54d65c367dbd 100644 --- a/method/dde_method.py +++ b/method/dde_method.py @@ -378,4 +378,6 @@ class DdeMethod(Src): """ 点击左上角 """ - self.click(10, 10) + for i in range(2): + self.click(10, 10) + self.esc()