mangoautomation 1.0.46__tar.gz → 1.0.48__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.46
+Version: 1.0.48
 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.12
+Requires-Dist: mangotools>=1.1.14
 Requires-Dist: adbutils~=2.8.9
 Requires-Dist: uiautodev==0.9.0
 

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

@@ -66,16 +66,16 @@ class AndroidDriver(AndroidPage,
     def a_assertion_element(self, name, ope_key, ope_value):
         self.base_data.log.debug(f'断言元素，名称：{name},key:{ope_key},value:{ope_value}')
         is_method = callable(getattr(AndroidAssertion(self.base_data), ope_key, None))
-        if is_method:
-            if ope_value['value'] is None:
-                raise MangoAutomationError(*ERROR_MSG_0031, value=(name,))
+        if is_method and ope_value.get('actual') is None:
+            raise MangoAutomationError(*ERROR_MSG_0031, value=(name,))
+
         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)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                Mango.s_e(MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value))
+                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.46 → mangoautomation-1.0.48}/mangoautomation/uidrive/web/async_web/__init__.py

@@ -76,7 +76,7 @@ class AsyncWebDevice(AsyncWebBrowser,
                 await Mango.a_e(AsyncWebAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                Mango.s_e(MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value))
+                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.46 → mangoautomation-1.0.48}/mangoautomation/uidrive/web/sync_web/__init__.py

@@ -75,7 +75,7 @@ class SyncWebDevice(SyncWebBrowser,
                 Mango.s_e(SyncWebAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                Mango.s_e(MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value))
+                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.46 → mangoautomation-1.0.48/mangoautomation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.46
+Version: 1.0.48
 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.12
+Requires-Dist: mangotools>=1.1.14
 Requires-Dist: adbutils~=2.8.9
 Requires-Dist: uiautodev==0.9.0
 

{mangoautomation-1.0.46 → mangoautomation-1.0.48}/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.12
+mangotools>=1.1.14
 adbutils~=2.8.9
 uiautodev==0.9.0

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

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = '1.0.46'
+__version__ = '1.0.48'
 
 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.12',
+        'mangotools>=1.1.14',
         'adbutils~=2.8.9',
         'uiautodev==0.9.0',