mangoautomation 1.0.48__tar.gz → 1.0.49__tar.gz

{mangoautomation-1.0.48/mangoautomation.egg-info → mangoautomation-1.0.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.48
+Version: 1.0.49
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏
@@ -12,7 +12,7 @@ Requires-Dist: pydantic==2.9.2
 Requires-Dist: playwright==1.43.0
 Requires-Dist: uiautomation==2.0.20
 Requires-Dist: uiautomator2==3.2.5
-Requires-Dist: mangotools>=1.1.14
+Requires-Dist: mangotools>=1.1.17
 Requires-Dist: adbutils~=2.8.9
 Requires-Dist: uiautodev==0.9.0
 

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/mangoautomation/models/_ui_model.py

@@ -45,8 +45,7 @@ class ElementResultModel(BaseModel):
     type: int
     ope_key: str | None = None
     ope_value: dict = {}
-    expect: str | None = None
-    actual: str | None = None
+    ass_msg: str | None = None
     sql: str | None = None
     key_list: str | None = None
     key: str | None = None

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/mangoautomation/uidrive/_async_element.py

@@ -146,20 +146,24 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0053)
         await self.__ope_value(True)
-        if self.drive_type == DriveTypeEnum.WEB.value:
-            await self.web_assertion_element(
-                self.element_model.name,
-                self.element_model.ope_key,
-                {i.f: i.v for i in self.element_model.ope_value}
-            )
-        elif self.drive_type == DriveTypeEnum.ANDROID.value:
-            self.a_assertion_element(
-                self.element_model.name,
-                self.element_model.ope_key,
-                {i.f: i.v for i in self.element_model.ope_value}
-            )
-        else:
-            pass
+        try:
+            if self.drive_type == DriveTypeEnum.WEB.value:
+                self.element_result_model.ass_msg = await self.web_assertion_element(
+                    self.element_model.name,
+                    self.element_model.ope_key,
+                    {i.f: i.v for i in self.element_model.ope_value}
+                )
+            elif self.drive_type == DriveTypeEnum.ANDROID.value:
+                self.element_result_model.ass_msg = self.a_assertion_element(
+                    self.element_model.name,
+                    self.element_model.ope_key,
+                    {i.f: i.v for i in self.element_model.ope_value}
+                )
+            else:
+                pass
+        except MangoAutomationError as error:
+            self.element_result_model.ass_msg = error.msg
+            raise MangoAutomationError(*ERROR_MSG_0054)
         self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
 
     async def __sql(self):

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/mangoautomation/uidrive/_sync_element.py

@@ -146,20 +146,24 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0053)
         self.__ope_value(True)
-        if self.drive_type == DriveTypeEnum.WEB.value:
-            self.web_assertion_element(
-                self.element_model.name,
-                self.element_model.ope_key,
-                {i.f: i.v for i in self.element_model.ope_value}
-            )
-        elif self.drive_type == DriveTypeEnum.ANDROID.value:
-            self.a_assertion_element(
-                self.element_model.name,
-                self.element_model.ope_key,
-                {i.f: i.v for i in self.element_model.ope_value}
-            )
-        else:
-            pass
+        try:
+            if self.drive_type == DriveTypeEnum.WEB.value:
+                self.element_result_model.ass_msg = self.web_assertion_element(
+                    self.element_model.name,
+                    self.element_model.ope_key,
+                    {i.f: i.v for i in self.element_model.ope_value}
+                )
+            elif self.drive_type == DriveTypeEnum.ANDROID.value:
+                self.element_result_model.ass_msg = self.a_assertion_element(
+                    self.element_model.name,
+                    self.element_model.ope_key,
+                    {i.f: i.v for i in self.element_model.ope_value}
+                )
+            else:
+                pass
+        except MangoAutomationError as error:
+            self.element_result_model.ass_msg = error.msg
+            raise MangoAutomationError(*ERROR_MSG_0054)
         self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
 
     def __sql(self):

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/mangoautomation/uidrive/android/__init__.py

@@ -72,10 +72,11 @@ class AndroidDriver(AndroidPage,
         try:
             if is_method:
                 self.base_data.log.debug(f'开始断言-1，方法：{ope_key}，断言值：{ope_value}')
-                Mango.s_e(AndroidAssertion(self.base_data), ope_key, ope_value)
+                return Mango.s_e(AndroidAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
+                return MangoAssertion(self.base_data.mysql_connect) \
+                    .ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
         except AssertionError as error:
             self.base_data.log.error(f'安卓自动化失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0017, value=error.args)

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/mangoautomation/uidrive/android/_assertion.py

@@ -17,64 +17,68 @@ class AndroidAssertion(metaclass=Meta):
     def __init__(self, base_data: BaseData):
         self.base_data = base_data
 
-    @sync_method_callback('ass_android', '元素断言', 1,[
+    @sync_method_callback('ass_android', '元素断言', 1, [
         MethodModel(f='actual')])
     def a_assert_ele_exists(self, actual: UiObject):
         """元素存在"""
-        assert actual.count
+        assert actual.count, f'实际={actual.count}, 预期=元素存在'
+        return f'实际={actual.count}, 预期=元素存在'
 
-    @sync_method_callback('ass_android', '元素断言', 2,[
+    @sync_method_callback('ass_android', '元素断言', 2, [
         MethodModel(f='actual'),
         MethodModel(f='expect', p='请输入预期内容', d=True)])
     def a_assert_ele_count(self, actual: UiObject, expect):
         """元素计数"""
-        assert int(actual.count) == int(expect)
+        assert int(actual.count) == int(expect), f'实际={actual.count}, 预期={expect}'
+        return f'实际={actual.count}, 预期={expect}'
 
-    @sync_method_callback('ass_android', '元素断言', 3,[
+    @sync_method_callback('ass_android', '元素断言', 3, [
         MethodModel(f='actual'),
         MethodModel(f='expect', p='请输入预期文本', d=True)])
     def a_assert_ele_text(self, actual: UiObject, expect: str):
         """元素文本内容"""
-        assert actual.get_text() == expect, \
-            f"实际='{actual.get_text()}', 预期='{expect}'"
+        assert actual.get_text() == expect, f"实际='{actual.get_text()}', 预期='{expect}'"
+        return f'实际={actual.get_text()}, 预期={expect}'
 
-    @sync_method_callback('ass_android', '元素断言', 4,[
+    @sync_method_callback('ass_android', '元素断言', 4, [
         MethodModel(f='actual')])
     def a_assert_ele_clickable_true(self, actual: UiObject):
         """元素可点击"""
-        assert actual.info['clickable'], \
-            f"实际={actual.info['clickable']}, 预期=可点击"
+        assert actual.info['clickable'], f"实际={actual.info['clickable']}, 预期=可点击"
+        return f"实际={actual.info['clickable']}, 预期=可点击"
 
-    @sync_method_callback('ass_android', '元素断言', 5,[
+    @sync_method_callback('ass_android', '元素断言', 5, [
         MethodModel(f='actual')])
     def a_assert_ele_clickable_false(self, actual: UiObject):
         """元素不可点击"""
-        assert not actual.info['clickable'], \
-            f"实际={actual.info['clickable']}, 预期=元素不可点击"
+        assert not actual.info['clickable'], f"实际={actual.info['clickable']}, 预期=元素不可点击"
+        return f"实际={actual.info['clickable']}, 预期=元素不可点击"
 
-    @sync_method_callback('ass_android', '元素断言', 6,[
+    @sync_method_callback('ass_android', '元素断言', 6, [
         MethodModel(f='actual')])
     def a_assert_ele_visible_true(self, actual: UiObject):
         """元素可见"""
-        assert actual.exists and actual.info['visible'], \
-            f"实际={actual.info['visible']}, 预期=元素可见"
+        assert actual.exists and actual.info['visible'], f"实际={actual.info['visible']}, 预期=元素可见"
 
-    @sync_method_callback('ass_android', '元素断言', 7,[
+        return f"实际={actual.info['visible']}, 预期=元素可见"
+
+    @sync_method_callback('ass_android', '元素断言', 7, [
         MethodModel(f='actual')])
     def a_assert_ele_visible_false(self, actual: UiObject):
         """元素不可见"""
-        assert actual.exists and not actual.info['visible'], \
-            f"实际={actual.info['visible']}, 预期=元素不可见"
+        assert actual.exists and not actual.info['visible'], f"实际={actual.info['visible']}, 预期=元素不可见"
+        return f"实际={actual.info['visible']}, 预期=元素不可见"
 
-    @sync_method_callback('ass_android', '元素断言', 8,[
+    @sync_method_callback('ass_android', '元素断言', 8, [
         MethodModel(f='expect', p='请输入弹窗标题文本', d=False)])
     def a_assert_dialog_exists(self, expect: str):
         """弹窗存在"""
         dialog = self.base_data.android(text=expect) if expect else self.base_data.android(
             className="android.app.AlertDialog")
         assert dialog.exists, "未找到预期弹窗"
+        return f"实际={dialog.exists}, 预期=弹窗存在"
 
-    @sync_method_callback('ass_android', '元素断言', 9,[
+    @sync_method_callback('ass_android', '元素断言', 9, [
         MethodModel(f='actual'),
         MethodModel(f='expect', p='请输入断言目标文本', d=True)])
     def a_assert_ele_in_list(self, actual: UiObject, expect: str):
@@ -83,3 +87,4 @@ class AndroidAssertion(metaclass=Meta):
             raise AssertionError("传入的元素不是可滑动的列表")
         actual.scroll.vert.to(text=expect)
         assert self.base_data.android(text=expect).exists, f"列表中未找到文本: {expect}"
+        return f"实际={self.base_data.android(text=expect).exists}, 预期={expect}"

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/mangoautomation/uidrive/web/async_web/__init__.py

@@ -64,7 +64,7 @@ class AsyncWebDevice(AsyncWebBrowser,
             self.base_data.log.error(f'WEB自动化操作失败-3，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0012)
 
-    async def web_assertion_element(self, name, ope_key, ope_value):
+    async def web_assertion_element(self, name, ope_key, ope_value) -> str:
         self.base_data.log.debug(f'断言元素，名称：{name},key:{ope_key},value:{ope_value}')
         is_method = callable(getattr(AsyncWebAssertion, ope_key, None))
         try:
@@ -73,10 +73,11 @@ class AsyncWebDevice(AsyncWebBrowser,
                     traceback.print_exc()
                     raise MangoAutomationError(*ERROR_MSG_0031, value=(name,))
                 self.base_data.log.debug(f'开始断言-1，方法：{ope_key}，断言值：{ope_value}')
-                await Mango.a_e(AsyncWebAssertion(self.base_data), ope_key, ope_value)
+                return await Mango.a_e(AsyncWebAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
+                return MangoAssertion(self.base_data.mysql_connect) \
+                    .ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
         except AssertionError as error:
             self.base_data.log.debug(f'WEB自动化断言失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0017, value=error.args)

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/mangoautomation/uidrive/web/async_web/_assertion.py

@@ -28,6 +28,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).to_have_count(int(expect))
         except AssertionError as e:
             raise AssertionError(f'实际={await actual.count()}, 预期={expect}') from e
+        return f'实际={await actual.count()}, 预期={expect}'
 
     @async_method_callback('ass_web', '元素断言', 1, [MethodModel(f='actual')])
     async def w_all_not_to_be_empty(self, actual: Locator):
@@ -35,6 +36,7 @@ class AsyncWebAssertion(metaclass=Meta):
         count = await actual.count()
         if count == 0:
             assert False, f'实际={count}, 预期>0'
+        return f'实际={count}, 预期>0'
 
     @async_method_callback('ass_web', '元素断言', 1, [
         MethodModel(f='actual'),
@@ -43,10 +45,13 @@ class AsyncWebAssertion(metaclass=Meta):
         """元素是否存在"""
         if int(expect) == 0:
             assert actual is None, f'实际={actual}, 预期={expect}'
+            return f'实际={actual}, 预期={expect}'
+
         else:
             if actual:
                 try:
-                    await exp(actual).to_have_count(int(expect)),
+                    await exp(actual).to_have_count(int(expect))
+                    return f'实际={actual.count()}, 预期={expect}'
                 except AssertionError as e:
                     raise AssertionError(f'实际={actual.count()}, 预期={expect}') from e
             else:
@@ -61,6 +66,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_contain_text(expect)
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期={expect}') from e
+        return f'实际={actual}, 预期={expect}'
 
     @async_method_callback('ass_web', '元素断言', 3, [MethodModel(f='actual')])
     async def w_not_to_be_empty(self, actual: Locator):
@@ -69,6 +75,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_empty()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不为空') from e
+        return f'实际={actual}, 预期=不为空'
 
     @async_method_callback('ass_web', '元素断言', 4, [MethodModel(f='actual')])
     async def w_not_to_be_enabled(self, actual: Locator):
@@ -77,6 +84,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_enabled()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不启用') from e
+        return f'实际={actual}, 预期=不启用'
 
     @async_method_callback('ass_web', '元素断言', 5, [MethodModel(f='actual')])
     async def w_not_to_be_focused(self, actual: Locator):
@@ -85,6 +93,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_focused()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不聚焦') from e
+        return f'实际={actual}, 预期=不聚焦'
 
     @async_method_callback('ass_web', '元素断言', 6, [MethodModel(f='actual')])
     async def w_not_to_be_hidden(self, actual: Locator):
@@ -93,6 +102,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_hidden()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不可隐藏') from e
+        return f'实际={actual}, 预期=不可隐藏'
 
     @async_method_callback('ass_web', '元素断言', 7, [MethodModel(f='actual')])
     async def w_not_to_be_in_viewport(self, actual: Locator):
@@ -101,6 +111,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_in_viewport()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不在视窗中') from e
+        return f'实际={actual}, 预期=不在视窗中'
 
     @async_method_callback('ass_web', '元素断言', 8, [MethodModel(f='actual')])
     async def w_not_to_be_visible(self, actual: Locator):
@@ -109,6 +120,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_be_visible()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不可见') from e
+        return f'实际={actual}, 预期=不可见'
 
     @async_method_callback('ass_web', '元素断言', 9, [
         MethodModel(f='actual'),
@@ -119,6 +131,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).not_to_have_class(expect)
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=没有阶级') from e
+        return f'实际={actual}, 预期=没有阶级'
 
     @async_method_callback('ass_web', '元素断言', 10, [MethodModel(f='actual')])
     async def w_to_be_checked(self, actual: Locator):
@@ -127,6 +140,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).to_be_checked()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=复选框已选中') from e
+        return f'实际={actual}, 预期=复选框已选中'
 
     @async_method_callback('ass_web', '元素断言', 11, [MethodModel(f='actual')])
     async def w_to_be_disabled(self, actual: Locator):
@@ -135,6 +149,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).to_be_disabled()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=已禁用') from e
+        return f'实际={actual}, 预期=已禁用'
 
     @async_method_callback('ass_web', '元素断言', 12, [MethodModel(f='actual')])
     async def w_not_to_be_editable(self, actual: Locator):
@@ -143,15 +158,18 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).to_be_editable()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=已启用') from e
+        return f'实际={actual}, 预期=已启用'
 
     @async_method_callback('ass_web', '元素断言', 13, [MethodModel(f='actual')])
     async def w_to_be_empty(self, actual: Locator | list | None):
         """元素为空"""
         if actual is None:
             assert True, f'实际={actual}, 预期=为空'
+            return f'实际={actual}, 预期=为空'
         else:
             try:
                 await exp(actual).to_be_empty()
+                return f'实际={actual}, 预期=为空'
             except AssertionError as e:
                 raise AssertionError(f'实际={actual}, 预期=为空') from e
 
@@ -162,6 +180,7 @@ class AsyncWebAssertion(metaclass=Meta):
             await exp(actual).to_be_visible()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=可见') from e
+        return f'实际={actual}, 预期=可见'
     # @staticmethod
     # async def w_not_to_have_actuals(actual: Locator, actuals: list):
     #     """选择已选择选项"""
@@ -282,9 +301,3 @@ class AsyncWebAssertion(metaclass=Meta):
     #     """有价值"""
     #     locator = self.page.locator("input[type=number]")
     #     exp(locator).to_have_actual(re.compile(r"[0-9]"))
-
-
-if __name__ == '__main__':
-    from mangokit.decorator import func_info
-
-    print(func_info)

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/mangoautomation/uidrive/web/sync_web/__init__.py

@@ -64,7 +64,7 @@ class SyncWebDevice(SyncWebBrowser,
             self.base_data.log.error(f'WEB自动化操作失败-3，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0012)
 
-    def web_assertion_element(self, name, ope_key, ope_value):
+    def web_assertion_element(self, name, ope_key, ope_value) -> str:
         self.base_data.log.debug(f'断言元素，名称：{name},key:{ope_key},value:{ope_value}')
         is_method = callable(getattr(SyncWebAssertion, ope_key, None))
         try:
@@ -72,10 +72,11 @@ class SyncWebDevice(SyncWebBrowser,
                 if ope_value.get('actual', None) is None:
                     raise MangoAutomationError(*ERROR_MSG_0031, value=(name,))
                 self.base_data.log.debug(f'开始断言-1，方法：{ope_key}，断言值：{ope_value}')
-                Mango.s_e(SyncWebAssertion(self.base_data), ope_key, ope_value)
+                return Mango.s_e(SyncWebAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
+                return MangoAssertion(self.base_data.mysql_connect) \
+                    .ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
         except AssertionError as error:
             self.base_data.log.debug(f'WEB自动化断言失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0017, value=error.args)

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/mangoautomation/uidrive/web/sync_web/_assertion.py

@@ -5,10 +5,12 @@
 
 from playwright.sync_api import Locator, expect as exp
 
-from ....tools import Meta
-from ....uidrive._base_data import BaseData
 from mangotools.decorator import sync_method_callback
+from mangotools.exceptions.error_msg import ERROR_MSG_0021
 from mangotools.models import MethodModel
+from ....exceptions import MangoAutomationError
+from ....tools import Meta
+from ....uidrive._base_data import BaseData
 
 
 class SyncWebAssertion(metaclass=Meta):
@@ -26,6 +28,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).to_have_count(int(expect))
         except AssertionError as e:
             raise AssertionError(f'实际={actual.count()}, 预期={expect}') from e
+        return f'实际={actual.count()}, 预期={expect}'
 
     @sync_method_callback('ass_web', '元素断言', 1, [MethodModel(f='actual')])
     def w_all_not_to_be_empty(self, actual: Locator):
@@ -33,6 +36,7 @@ class SyncWebAssertion(metaclass=Meta):
         count = actual.count()
         if count == 0:
             assert False, f'实际={count}, 预期>0'
+        return f'实际={count}, 预期>0'
 
     @sync_method_callback('ass_web', '元素断言', 1, [
         MethodModel(f='actual'),
@@ -41,10 +45,12 @@ class SyncWebAssertion(metaclass=Meta):
         """元素存在个数"""
         if int(expect) == 0:
             assert actual is None, f'实际={actual}, 预期={expect}'
+            return f'实际={actual}, 预期={expect}'
         else:
             if actual:
                 try:
                     exp(actual).to_have_count(int(expect))
+                    return f'实际={actual.count()}, 预期={expect}'
                 except AssertionError as e:
                     raise AssertionError(f'实际={actual.count()}, 预期={expect}') from e
             else:
@@ -59,6 +65,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_contain_text(expect)
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期={expect}') from e
+        return f'实际={actual}, 预期={expect}'
 
     @sync_method_callback('ass_web', '元素断言', 3, [MethodModel(f='actual')])
     def w_not_to_be_empty(self, actual: Locator):
@@ -67,6 +74,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_empty()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不为空') from e
+        return f'实际={actual}, 预期=不为空'
 
     @sync_method_callback('ass_web', '元素断言', 4, [MethodModel(f='actual')])
     def w_not_to_be_enabled(self, actual: Locator):
@@ -75,6 +83,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_enabled()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不启用') from e
+        return f'实际={actual}, 预期=不启用'
 
     @sync_method_callback('ass_web', '元素断言', 5, [MethodModel(f='actual')])
     def w_not_to_be_focused(self, actual: Locator):
@@ -83,6 +92,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_focused()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不聚焦') from e
+        return f'实际={actual}, 预期=不聚焦'
 
     @sync_method_callback('ass_web', '元素断言', 6, [MethodModel(f='actual')])
     def w_not_to_be_hidden(self, actual: Locator):
@@ -91,6 +101,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_hidden()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不可隐藏') from e
+        return f'实际={actual}, 预期=不可隐藏'
 
     @sync_method_callback('ass_web', '元素断言', 7, [MethodModel(f='actual')])
     def w_not_to_be_in_viewport(self, actual: Locator):
@@ -99,6 +110,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_in_viewport()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不在视窗中') from e
+        return f'实际={actual}, 预期=不在视窗中'
 
     @sync_method_callback('ass_web', '元素断言', 8, [MethodModel(f='actual')])
     def w_not_to_be_visible(self, actual: Locator):
@@ -107,6 +119,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_be_visible()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=不可见') from e
+        return f'实际={actual}, 预期=不可见'
 
     @sync_method_callback('ass_web', '元素断言', 9, [
         MethodModel(f='actual'),
@@ -117,6 +130,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).not_to_have_class(expect)
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=没有阶级') from e
+        return f'实际={actual}, 预期=没有阶级'
 
     @sync_method_callback('ass_web', '元素断言', 10, [MethodModel(f='actual')])
     def w_to_be_checked(self, actual: Locator):
@@ -125,6 +139,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).to_be_checked()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=复选框已选中') from e
+        return f'实际={actual}, 预期=复选框已选中'
 
     @sync_method_callback('ass_web', '元素断言', 11, [MethodModel(f='actual')])
     def w_to_be_disabled(self, actual: Locator):
@@ -133,6 +148,7 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).to_be_disabled()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=已禁用') from e
+        return f'实际={actual}, 预期=已禁用'
 
     @sync_method_callback('ass_web', '元素断言', 12, [MethodModel(f='actual')])
     def w_not_to_be_editable(self, actual: Locator):
@@ -141,15 +157,19 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).to_be_editable()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=已启用') from e
+        return f'实际={actual}, 预期=已启用'
 
     @sync_method_callback('ass_web', '元素断言', 13, [MethodModel(f='actual')])
     def w_to_be_empty(self, actual: Locator | list | None):
         """元素为空"""
         if actual is None:
             assert True, f'实际={actual}, 预期=为空'
+            return f'实际={actual}, 预期=为空'
+
         else:
             try:
                 exp(actual).to_be_empty()
+                return f'实际={actual}, 预期=为空'
             except AssertionError as e:
                 raise AssertionError(f'实际={actual}, 预期=为空') from e
 
@@ -160,6 +180,8 @@ class SyncWebAssertion(metaclass=Meta):
             exp(actual).to_be_visible()
         except AssertionError as e:
             raise AssertionError(f'实际={actual}, 预期=可见') from e
+        return f'实际={actual}, 预期=可见'
+
     # @staticmethod
     # def w_not_to_have_actuals(actual: Locator, actuals: list):
     #     """选择已选择选项"""

{mangoautomation-1.0.48 → mangoautomation-1.0.49/mangoautomation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.48
+Version: 1.0.49
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏
@@ -12,7 +12,7 @@ Requires-Dist: pydantic==2.9.2
 Requires-Dist: playwright==1.43.0
 Requires-Dist: uiautomation==2.0.20
 Requires-Dist: uiautomator2==3.2.5
-Requires-Dist: mangotools>=1.1.14
+Requires-Dist: mangotools>=1.1.17
 Requires-Dist: adbutils~=2.8.9
 Requires-Dist: uiautodev==0.9.0
 

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/mangoautomation.egg-info/requires.txt

@@ -3,6 +3,6 @@ pydantic==2.9.2
 playwright==1.43.0
 uiautomation==2.0.20
 uiautomator2==3.2.5
-mangotools>=1.1.14
+mangotools>=1.1.17
 adbutils~=2.8.9
 uiautodev==0.9.0

{mangoautomation-1.0.48 → mangoautomation-1.0.49}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = '1.0.48'
+__version__ = '1.0.49'
 
 with open("README.md", "r", encoding='utf-8') as fh:
     long_description = fh.read()
@@ -21,7 +21,7 @@ setup(
         'playwright==1.43.0',
         'uiautomation==2.0.20',
         'uiautomator2==3.2.5',
-        'mangotools>=1.1.14',
+        'mangotools>=1.1.17',
         'adbutils~=2.8.9',
         'uiautodev==0.9.0',