mangoautomation 1.0.44__tar.gz → 1.0.47__tar.gz

{mangoautomation-1.0.44/mangoautomation.egg-info → mangoautomation-1.0.47}/PKG-INFO

@@ -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 → mangoautomation-1.0.47}/mangoautomation/models/__init__.py

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

{mangoautomation-1.0.44 → mangoautomation-1.0.47}/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-1.0.44 → mangoautomation-1.0.47}/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-1.0.44 → mangoautomation-1.0.47}/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-1.0.44 → mangoautomation-1.0.47}/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-1.0.44 → mangoautomation-1.0.47}/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-1.0.44 → mangoautomation-1.0.47}/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-1.0.44 → mangoautomation-1.0.47}/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-1.0.47/mangoautomation/uidrive/ios/__init__.py

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

{mangoautomation-1.0.44 → mangoautomation-1.0.47}/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)

{mangoautomation-1.0.44 → mangoautomation-1.0.47}/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 → mangoautomation-1.0.47/mangoautomation.egg-info}/PKG-INFO

@@ -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 → mangoautomation-1.0.47}/mangoautomation.egg-info/SOURCES.txt

@@ -32,6 +32,7 @@ mangoautomation/uidrive/android/_element.py
 mangoautomation/uidrive/android/_equipment.py
 mangoautomation/uidrive/android/_new_android.py
 mangoautomation/uidrive/android/_page.py
+mangoautomation/uidrive/ios/__init__.py
 mangoautomation/uidrive/pc/__init__.py
 mangoautomation/uidrive/pc/assertion.py
 mangoautomation/uidrive/pc/customization.py

{mangoautomation-1.0.44 → mangoautomation-1.0.47}/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.0.28
+mangotools>=1.1.14
 adbutils~=2.8.9
 uiautodev==0.9.0

{mangoautomation-1.0.44 → mangoautomation-1.0.47}/setup.py

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