mangoautomation 1.0.44__py3-none-any.whl → 1.0.47__py3-none-any.whl

mangoautomation/models/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# @Project: 芒果测试平台# @Description:
+# @Project: 芒果测试平台
+# @Description:
 # @Time   : 2023-09-09 23:17
 # @Author : 毛鹏
 import sys

mangoautomation/uidrive/_async_element.py

@@ -10,7 +10,7 @@ from typing import Optional
 
 from playwright._impl._errors import TargetClosedError, Error
 
-from mangotools.assertion import PublicAssertion
+from mangotools.assertion import MangoAssertion
 from mangotools.decorator import async_retry
 from mangotools.enums import StatusEnum
 from ..enums import ElementOperationEnum, DriveTypeEnum
@@ -221,7 +221,7 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                     if is_ass:
                         if callable(getattr(AsyncWebAssertion, self.element_model.ope_key, None)):
                             i.v = loc
-                        elif callable(getattr(PublicAssertion, self.element_model.ope_key, None)):
+                        elif callable(getattr(MangoAssertion(), self.element_model.ope_key, None)):
                             i.v = self.element_result_model.element_text
                     else:
                         i.v = loc

mangoautomation/uidrive/_sync_element.py

@@ -10,7 +10,7 @@ from typing import Optional
 import time
 from playwright._impl._errors import TargetClosedError, Error
 
-from mangotools.assertion import PublicAssertion
+from mangotools.assertion import MangoAssertion
 from mangotools.decorator import sync_retry
 from mangotools.enums import StatusEnum
 from ..enums import ElementOperationEnum, DriveTypeEnum
@@ -221,7 +221,7 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                     if is_ass:
                         if callable(getattr(SyncWebAssertion, self.element_model.ope_key, None)):
                             i.v = loc
-                        elif callable(getattr(PublicAssertion, self.element_model.ope_key, None)):
+                        elif callable(getattr(MangoAssertion(), self.element_model.ope_key, None)):
                             i.v = self.element_result_model.element_text
                     else:
                         i.v = loc

mangoautomation/uidrive/android/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# @Project: 芒果测试平台# @Description:
+# @Project: 芒果测试平台
+# @Description:
 # @Time   : 2023-09-09 23:17
 # @Author : 毛鹏
 
@@ -7,8 +8,7 @@ from uiautomator2 import UiObject, UiObjectNotFoundError
 from uiautomator2.exceptions import XPathElementNotFoundError
 from uiautomator2.xpath import XPathSelector
 
-from mangotools.assertion import PublicAssertion
-from mangotools.assertion import SqlAssertion
+from mangotools.assertion import MangoAssertion
 from ..android._application import AndroidApplication
 from ..android._assertion import AndroidAssertion
 from ..android._customization import AndroidCustomization
@@ -65,28 +65,17 @@ 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))
-        is_method_public = callable(getattr(PublicAssertion, ope_key, None))
-
-        if is_method or is_method_public:
-            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)
-            elif is_method_public:
-                self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                Mango.s_e(PublicAssertion, ope_key, ope_value)
             else:
-                if self.base_data.mysql_connect is not None:
-                    SqlAssertion.mysql_obj = self.base_data.mysql_connect
-                    self.base_data.log.debug(f'开始断言-3，方法：sql相等端游，实际值：{ope_value}')
-                    SqlAssertion.sql_is_equal(**ope_value)
-                else:
-                    raise MangoAutomationError(*ERROR_MSG_0019)
+                self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
+                MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value)
         except AssertionError as error:
             self.base_data.log.error(f'安卓自动化失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0017, value=error.args)

mangoautomation/uidrive/android/_application.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# @Project: 芒果测试平台# @Description:
+# @Project: 芒果测试平台
+# @Description:
 # @Time   : 2023-09-09 23:17
 # @Author : 毛鹏
 import time

mangoautomation/uidrive/android/_assertion.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# @Project: 芒果测试平台# @Description:
+# @Project: 芒果测试平台
+# @Description:
 # @Time   : 2023-09-09 23:17
 # @Author : 毛鹏
 from uiautomator2 import UiObject

mangoautomation/uidrive/android/_element.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# @Project: 芒果测试平台# @Description:
+# @Project: 芒果测试平台
+# @Description:
 # @Time   : 2023-09-09 23:17
 # @Author : 毛鹏
 import os.path

mangoautomation/uidrive/android/_equipment.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# @Project: 芒果测试平台# @Description:
+# @Project: 芒果测试平台
+# @Description:
 # @Time   : 03-09-09 3:17
 # @Author : 毛鹏
 from time import sleep

mangoautomation/uidrive/ios/__init__.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# @Project: 芒果测试平台
+# @Description: 
+# @Time   : 2025-07-03 14:38
+# @Author : 毛鹏

mangoautomation/uidrive/web/async_web/__init__.py

@@ -9,7 +9,7 @@ import traceback
 from playwright._impl._errors import TimeoutError, Error
 from playwright.async_api._generated import Locator
 
-from mangotools.assertion import PublicAssertion, SqlAssertion
+from mangotools.assertion import MangoAssertion
 from mangotools.enums import StatusEnum
 from mangotools.mangos import Mango
 from ....enums import ElementExpEnum, ElementOperationEnum
@@ -67,7 +67,6 @@ class AsyncWebDevice(AsyncWebBrowser,
     async def web_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(AsyncWebAssertion, ope_key, None))
-        is_method_public = callable(getattr(PublicAssertion, ope_key, None))
         try:
             if is_method:
                 if ope_value.get('actual', None) is None:
@@ -75,16 +74,9 @@ class AsyncWebDevice(AsyncWebBrowser,
                     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)
-            elif is_method_public:
-                self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                Mango.s_e(PublicAssertion, ope_key, ope_value)
             else:
-                if self.base_data.mysql_connect is not None:
-                    SqlAssertion.mysql_obj = self.base_data.mysql_connect
-                    self.base_data.log.debug(f'开始断言-3，方法：sql相等端游，实际值：{ope_value}')
-                    await SqlAssertion.sql_is_equal(**ope_value)
-                else:
-                    raise MangoAutomationError(*ERROR_MSG_0019)
+                self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
+                MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value)
         except AssertionError as error:
             self.base_data.log.debug(f'WEB自动化断言失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0017, value=error.args)
@@ -124,7 +116,7 @@ class AsyncWebDevice(AsyncWebBrowser,
                 try:
                     count = await locator.count()
                 except Error as error:
-                    self.base_data.log.error(
+                    self.base_data.log.debug(
                         f'WEB自动化查找元素失败-2，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
                     raise MangoAutomationError(*ERROR_MSG_0041, )
                 if count > 0:

mangoautomation/uidrive/web/sync_web/__init__.py

@@ -9,7 +9,7 @@ import traceback
 from playwright._impl._errors import TimeoutError, Error
 from playwright.sync_api._generated import Locator
 
-from mangotools.assertion import PublicAssertion, SqlAssertion
+from mangotools.assertion import MangoAssertion
 from mangotools.enums import StatusEnum
 from mangotools.mangos import Mango
 from ....enums import ElementExpEnum
@@ -67,23 +67,15 @@ class SyncWebDevice(SyncWebBrowser,
     def web_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(SyncWebAssertion, ope_key, None))
-        is_method_public = callable(getattr(PublicAssertion, ope_key, None))
         try:
             if is_method:
                 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)
-            elif is_method_public:
-                self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                Mango.s_e(PublicAssertion, ope_key, ope_value)
             else:
-                if self.base_data.mysql_connect is not None:
-                    SqlAssertion.mysql_obj = self.base_data.mysql_connect
-                    self.base_data.log.debug(f'开始断言-3，方法：sql相等端游，实际值：{ope_value}')
-                    SqlAssertion.sql_is_equal(**ope_value)
-                else:
-                    raise MangoAutomationError(*ERROR_MSG_0019)
+                self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
+                MangoAssertion(self.base_data.mysql_connect).ass(ope_key, ope_value)
         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.44.dist-info → mangoautomation-1.0.47.dist-info}/METADATA

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

{mangoautomation-1.0.44.dist-info → mangoautomation-1.0.47.dist-info}/RECORD

@@ -5,24 +5,25 @@ mangoautomation/enums/_ui_enum.py,sha256=rdkejsyc4ogZbyNfZcp1q0V0bDPo14vg0A6or6S
 mangoautomation/exceptions/__init__.py,sha256=dXtRZSuYg3e_lwYUKYvYjtxTKHITdbi2l9XkHk9DpfY,374
 mangoautomation/exceptions/_error_msg.py,sha256=GrB9crXQMNlq1Ng8a7RsuKfDHDhXglu_CQ_62lhj_iQ,5437
 mangoautomation/exceptions/_exceptions.py,sha256=BiyST1QPivpfIOuKn1gKhpXOyBv6gfip_KvlQuu8ctw,385
-mangoautomation/models/__init__.py,sha256=XdqEQNfIw7mcnmv3ZgWPJyFwQvap5Cu2ZMKcIK4wn9M,416
+mangoautomation/models/__init__.py,sha256=Vc0MADLdIY2TkWelDeXdvLlg3QbVF5U8pc_-1UyWsNU,418
 mangoautomation/models/_ui_model.py,sha256=IGophozQMO-NQjM_DPdlwud484yfWQw1CRwbDWjI3Vs,1446
 mangoautomation/tools/__init__.py,sha256=cc6zpsEdp3JiIx7HfOz-Vob7oTIIFzsuxDLgl20har4,443
 mangoautomation/tools/_mate.py,sha256=9lk_EJnAX_OyXbe5WacyHkkcEr2ScBgasl6eUnlklWA,405
 mangoautomation/tools/_uiautodev.py,sha256=RMOQMXse744xwUDb1_l7qDv9mUiqZt1Gm5sbB-nlgDk,1388
 mangoautomation/uidrive/__init__.py,sha256=Tk_gh4Qg2qnewEGxa-7Id4fkQLY3fvQE4X7JB0BEscY,577
-mangoautomation/uidrive/_async_element.py,sha256=gXHsUxZxmiYvUNq8RqPP3UGupOscTvz_mD7xI2qapRA,13424
+mangoautomation/uidrive/_async_element.py,sha256=al5j4bw8OcBo2Prb8gHTzbtf3KYL-Tr5fPoRUuOlEoY,13424
 mangoautomation/uidrive/_base_data.py,sha256=ur2Ts40MAhOYXb0vGVXZdSwEVCI3Csri9I9f1pw1r4Y,3766
 mangoautomation/uidrive/_driver_object.py,sha256=Re8j6VLHKfwW2VFdi-1XFRuix8tRBLcHYRBLVF6CApE,1962
-mangoautomation/uidrive/_sync_element.py,sha256=s9wb_RUCDcyONhRghe5T0I7zpTfvzRK3DhlxmT_DyVk,13242
-mangoautomation/uidrive/android/__init__.py,sha256=P8Qa1tuTLBlRhRrTmH7fGwTIo8TDgorRHSfZC2EQA4w,5999
-mangoautomation/uidrive/android/_application.py,sha256=Cj7-oDPmqF-PMirRZgjt5xy_nqmUmRIZWt_VJ8EoKTE,2798
-mangoautomation/uidrive/android/_assertion.py,sha256=Rnf0ZSbegczxj1oKoCKe-__oLs9ugzIG_KlJbO_w0vI,3629
+mangoautomation/uidrive/_sync_element.py,sha256=e67DngrDdJyug5nT-Gf1fcTAHAM-0lVmvrAHOhgfwjQ,13242
+mangoautomation/uidrive/android/__init__.py,sha256=iHOagkrAlt4kyUgtbzGH-nfxTwNL7sf-S5zjBhKlxCU,5422
+mangoautomation/uidrive/android/_application.py,sha256=EeEM0MPtOPeYeKx92mtMFWqGpCRmri-D_CzXvPt13RA,2800
+mangoautomation/uidrive/android/_assertion.py,sha256=IytUBalJwOQNwwVFaL-Di79-TBFbBs5pnoCVqqptZQg,3631
 mangoautomation/uidrive/android/_customization.py,sha256=pCLMmruozOyCJQZWAYupxxKqpWmZyCYsfSBw3XW7vf0,381
-mangoautomation/uidrive/android/_element.py,sha256=pLtiAfskhlMdemy4KogdiDB_AKlB_j1MvD5M5pIE3eU,6987
-mangoautomation/uidrive/android/_equipment.py,sha256=v-QgBxZMGr--ZV6HpttopsChOWTCNRCObVYVVomDNR8,5123
+mangoautomation/uidrive/android/_element.py,sha256=lOrQyQhOoJ2LrbiQ9t0wxH7LcpwZgyDxU0iUuKaSjRo,6989
+mangoautomation/uidrive/android/_equipment.py,sha256=WRaXLf4DuVzxG8TL5c4lHam6hZo_jsWwitYQUun3Srk,5125
 mangoautomation/uidrive/android/_new_android.py,sha256=UHj2DaNBfgvnJxYIzmUNc3gqTIRXxL_5kxEDQVbzWNw,1637
 mangoautomation/uidrive/android/_page.py,sha256=cOPKlIucf-rqtpm9AkpZtAnDd9QGvJRGLXS15kPVhIM,4454
+mangoautomation/uidrive/ios/__init__.py,sha256=SdxI8e5AOoAb8JTaDoMkObezIluJ50nm2b6zeDHv1PI,125
 mangoautomation/uidrive/pc/__init__.py,sha256=gp3T9C5bSA78dv1AgWXeB9yQQi6q5Tkd0NedCencGWo,2275
 mangoautomation/uidrive/pc/assertion.py,sha256=mH25hZ2i4T8kA1F2loW_nuPJ-Hb0z1pwILTJqkwwpLA,125
 mangoautomation/uidrive/pc/customization.py,sha256=hHf66ImrVxFlGtONrWSHUDrYjmWFc4ANJ883TIrJFG8,239
@@ -30,7 +31,7 @@ mangoautomation/uidrive/pc/element.py,sha256=LdlWHhvXsaHH6jTp6nNrF81OWPtx81dct4y
 mangoautomation/uidrive/pc/input_device.py,sha256=F6ZqKja3XkJww66x3l9Idha3R19D832J-5TfiKWmUso,353
 mangoautomation/uidrive/pc/new_windows.py,sha256=lETHZa7cW8Z0iUShzgVTRxqivkYaOo8WIE58q_8KYfQ,2338
 mangoautomation/uidrive/web/__init__.py,sha256=MgTklzty_SvX4UemCnqJuViq3cIjUgAjFoEtP-mcDWw,123
-mangoautomation/uidrive/web/async_web/__init__.py,sha256=yPFdY-fQhAZt9HfLUdxcyyELyVTDVUeLLoI9quhsel0,8833
+mangoautomation/uidrive/web/async_web/__init__.py,sha256=RLP0BgpzJcDIQzQ4mAEiwJ4ZlB6gbbdxNYbpWBHhIv8,8317
 mangoautomation/uidrive/web/async_web/_assertion.py,sha256=8cLYPe3pP6FrcjDZoFOphP7psgoJJMozq0Z_BDGNXCo,11859
 mangoautomation/uidrive/web/async_web/_browser.py,sha256=39YroURzagpq0HoEn1RZnNf1KDKXIgWpKSvp5L_Yut0,5286
 mangoautomation/uidrive/web/async_web/_customization.py,sha256=uw6p9uLHLXglgSkH4qjDl1v0iGlaNjvf8LljRH5cAHU,347
@@ -38,7 +39,7 @@ mangoautomation/uidrive/web/async_web/_element.py,sha256=btIkX2nlic17sgSbXtNZ8h5
 mangoautomation/uidrive/web/async_web/_input_device.py,sha256=sMAMHb_8QyPx3pKci0gRDQc2O7h1OYMGyA7fCWl81iM,3288
 mangoautomation/uidrive/web/async_web/_new_browser.py,sha256=gKjrbDQwDON-Omd2QFKdzMHYLxWd0L_cdM_tXYNz5TI,5597
 mangoautomation/uidrive/web/async_web/_page.py,sha256=TCYf79qQdVBBTTNq2COZFJVcLCgg5Ksu9lMgmQPVInU,2147
-mangoautomation/uidrive/web/sync_web/__init__.py,sha256=wCYW7V-32Zpw7C8m6zLoxb8niLNopVVBvA-zJBS7e9M,8387
+mangoautomation/uidrive/web/sync_web/__init__.py,sha256=ZKwzsX4cJFBhouc6Su-vHRN1bm9Qu_xK1tcMfXC22nY,7877
 mangoautomation/uidrive/web/sync_web/_assertion.py,sha256=zZ4_4WiBQFSRwAh0P0JANa5z-ozbNTh3bnUqcZBti9s,11424
 mangoautomation/uidrive/web/sync_web/_browser.py,sha256=c7xHkIIFPawlzcVkGjwqeKfWAM--87wEJb3V3Ysi29w,5146
 mangoautomation/uidrive/web/sync_web/_customization.py,sha256=E_pfI8gKd0O6r4huJIvA6hoW-X9fSDVL4zEUqhHgxwE,355
@@ -49,8 +50,8 @@ mangoautomation/uidrive/web/sync_web/_page.py,sha256=MNekcL7o5YXEloeuvi3YrpOZxGh
 tests/__init__.py,sha256=UhCNFqiVjxdh4CXESNo4oE7qfjpYYVkeHbSE5-7LGDY,125
 tests/test_ui_and.py,sha256=4k0_3bx_k2KbZifeRWGK65sxtdiPUOjkNzZ5oxjrc18,672
 tests/test_ui_web.py,sha256=MFaUN8O5qKOMMgyk2eelhKZsYcSJm0Do6pCgsdBZEH4,2765
-mangoautomation-1.0.44.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
-mangoautomation-1.0.44.dist-info/METADATA,sha256=yQzTLzpQM2qvT1WXJFH3sI-fdcMBPzyFcKj1E9shD7Y,660
-mangoautomation-1.0.44.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mangoautomation-1.0.44.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
-mangoautomation-1.0.44.dist-info/RECORD,,
+mangoautomation-1.0.47.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
+mangoautomation-1.0.47.dist-info/METADATA,sha256=h7ku_P8za_BDUfEK1Ubabo20BjEjerwM9w42tqRAneA,660
+mangoautomation-1.0.47.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+mangoautomation-1.0.47.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
+mangoautomation-1.0.47.dist-info/RECORD,,