mangoautomation 1.0.34__tar.gz → 1.0.36__tar.gz

{mangoautomation-1.0.34/mangoautomation.egg-info → mangoautomation-1.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.34
+Version: 1.0.36
 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.1
+Requires-Dist: mangotools==1.0.22
 Requires-Dist: adbutils~=2.8.9
 
 # testkit

{mangoautomation-1.0.34 → mangoautomation-1.0.36}/mangoautomation/exceptions/_error_msg.py

@@ -10,10 +10,10 @@ ERROR_MSG_0003 = (4003, '')
 ERROR_MSG_0004 = (4004, '')
 ERROR_MSG_0005 = (4018, '断言失败，断言输入值是：空字符串、null或不满足函数接受类型')
 ERROR_MSG_0006 = (4006, '')
-ERROR_MSG_0007 = (4007, '')
+ERROR_MSG_0007 = (4007, '安卓设备被关闭，请检查设备')
 ERROR_MSG_0008 = (4008, '浏览器类型不正确，请联系管理员检查')
 ERROR_MSG_0009 = (4009, '浏览器路径不正确，请手动设置一个正确的浏览器路径，现在的路径：{}')
-ERROR_MSG_0010 = (4010, '浏览器被关闭，请重试')
+ERROR_MSG_0010 = (4010, '浏览器被关闭，请不要手动关闭浏览器')
 ERROR_MSG_0011 = (4011, '操作元素【{}】超时，请检查元素可见但是是否可操作或调整定位方式')
 ERROR_MSG_0012 = (4012, '操作失败，请检查输入的值是否有空字符串，null或不满足传参的值')
 ERROR_MSG_0013 = (

{mangoautomation-1.0.34 → mangoautomation-1.0.36}/mangoautomation/uidrive/_async_element.py

@@ -57,15 +57,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             self.base_data.log.debug(f'不存在这个类型，如果是非管理员看到这种提示，请联系管理员')
             raise Exception('不存在的设备类型')
 
-    async def clean_data(self):
-        try:
-            self.element_model.loc = self.base_data.test_data.replace(self.element_model.loc)
-            self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
-            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
-        except MangoAutomationError as error:
-            self.base_data.log.debug(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
-            raise MangoAutomationError(error.code, error.msg)
-
     async def element_main(self) -> ElementResultModel:
         try:
             await self.__main()
@@ -73,12 +64,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                 await asyncio.sleep(self.element_model.sleep)
             self.element_result_model.status = StatusEnum.SUCCESS.value
             self.element_result_model.error_message = None
-        except TargetClosedError as error:
-            self.base_data.setup()
-            self.base_data.log.debug(
-                f'浏览器关闭异常，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
-            self.element_result_model.status = StatusEnum.FAIL.value
-            self.element_result_model.error_message = '浏览器被关闭，请不要认关闭浏览器，非认为管理请联系管理员解决！'
         except MangoAutomationError as error:
             await self.__error(error.msg)
             self.base_data.log.debug(f'已知异常，类型：{type(error)}，失败详情：{error}')
@@ -97,17 +82,37 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
 
     @async_retry()
     async def __main(self):
-        await self.clean_data()
-        if self.element_model.type == ElementOperationEnum.OPE.value:
-            await self.__ope()
-        elif self.element_model.type == ElementOperationEnum.ASS.value:
-            await self.__ass()
-        elif self.element_model.type == ElementOperationEnum.SQL.value:
-            await self.__sql()
-        elif self.element_model.type == ElementOperationEnum.CUSTOM.value:
-            await self.__custom()
+        try:
+            self.element_model.loc = self.base_data.test_data.replace(self.element_model.loc)
+            self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
+            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
+        except MangoAutomationError as error:
+            self.base_data.log.debug(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
+            raise MangoAutomationError(error.code, error.msg)
+        if self.drive_type == DriveTypeEnum.WEB.value:
+            if not self.base_data.page and self.base_data.context:
+                raise MangoAutomationError(*ERROR_MSG_0010)
+        elif self.drive_type == DriveTypeEnum.ANDROID.value:
+            if not self.base_data.android:
+                raise MangoAutomationError(*ERROR_MSG_0007)
         else:
-            raise MangoAutomationError(*ERROR_MSG_0015)
+            pass
+        try:
+            if self.element_model.type == ElementOperationEnum.OPE.value:
+                await self.__ope()
+            elif self.element_model.type == ElementOperationEnum.ASS.value:
+                await self.__ass()
+            elif self.element_model.type == ElementOperationEnum.SQL.value:
+                await self.__sql()
+            elif self.element_model.type == ElementOperationEnum.CUSTOM.value:
+                await self.__custom()
+            else:
+                raise MangoAutomationError(*ERROR_MSG_0015)
+        except TargetClosedError as error:
+            self.base_data.setup()
+            self.base_data.log.debug(
+                f'浏览器关闭异常，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+            raise MangoAutomationError(*ERROR_MSG_0010)
 
     async def __ope(self):
         method_name = getattr(self.element_model, 'ope_key', None)
@@ -122,7 +127,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             raise MangoAutomationError(*ERROR_MSG_0048)
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
-
         await self.__ope_value()
         if self.drive_type == DriveTypeEnum.WEB.value:
             await self.web_action_element(
@@ -208,18 +212,15 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                         'sub': self.element_model.sub
                     }
                     if self.drive_type == DriveTypeEnum.WEB.value:
-                        loc, \
-                            self.element_result_model.ele_quantity, \
+                        loc, self.element_result_model.ele_quantity, \
                             self.element_result_model.element_text \
                             = await self.web_find_ele(**find_params, is_iframe=self.element_model.is_iframe)
                     elif self.drive_type == DriveTypeEnum.ANDROID.value:
-                        loc, \
-                            self.element_result_model.ele_quantity, \
+                        loc, self.element_result_model.ele_quantity, \
                             self.element_result_model.element_text \
                             = self.a_find_ele(**find_params)
                     else:
-                        loc, \
-                            self.element_result_model.ele_quantity, \
+                        loc, self.element_result_model.ele_quantity, \
                             self.element_result_model.element_text \
                             = None, 0, None
 

{mangoautomation-1.0.34 → mangoautomation-1.0.36}/mangoautomation/uidrive/_sync_element.py

@@ -57,15 +57,6 @@ class SyncElement(SyncWebDevice, AndroidDriver):
             self.base_data.log.error(f'不存在这个类型，如果是非管理员看到这种提示，请联系管理员')
             raise Exception('不存在的设备类型')
 
-    def clean_data(self):
-        try:
-            self.element_model.loc = self.base_data.test_data.replace(self.element_model.loc)
-            self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
-            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
-        except MangoAutomationError as error:
-            self.base_data.log.debug(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
-            raise MangoAutomationError(error.code, error.msg)
-
     def element_main(self) -> ElementResultModel:
         try:
             self.__main()
@@ -73,12 +64,6 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                 time.sleep(self.element_model.sleep)
             self.element_result_model.status = StatusEnum.SUCCESS.value
             self.element_result_model.error_message = None
-        except TargetClosedError as error:
-            self.base_data.setup()
-            self.base_data.log.debug(
-                f'浏览器关闭异常，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
-            self.element_result_model.status = StatusEnum.FAIL.value
-            self.element_result_model.error_message = '浏览器被关闭，请不要认关闭浏览器，非认为管理请联系管理员解决！'
         except MangoAutomationError as error:
             self.__error(error.msg)
             self.base_data.log.debug(f'已知异常，类型：{type(error)}，失败详情：{error}')
@@ -97,17 +82,37 @@ class SyncElement(SyncWebDevice, AndroidDriver):
 
     @sync_retry()
     def __main(self):
-        self.clean_data()
-        if self.element_model.type == ElementOperationEnum.OPE.value:
-            self.__ope()
-        elif self.element_model.type == ElementOperationEnum.ASS.value:
-            self.__ass()
-        elif self.element_model.type == ElementOperationEnum.SQL.value:
-            self.__sql()
-        elif self.element_model.type == ElementOperationEnum.CUSTOM.value:
-            self.__custom()
+        try:
+            self.element_model.loc = self.base_data.test_data.replace(self.element_model.loc)
+            self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
+            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
+        except MangoAutomationError as error:
+            self.base_data.log.debug(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
+            raise MangoAutomationError(error.code, error.msg)
+        if self.drive_type == DriveTypeEnum.WEB.value:
+            if not self.base_data.page and self.base_data.context:
+                raise MangoAutomationError(*ERROR_MSG_0010)
+        elif self.drive_type == DriveTypeEnum.ANDROID.value:
+            if not self.base_data.android:
+                raise MangoAutomationError(*ERROR_MSG_0007)
         else:
-            raise MangoAutomationError(*ERROR_MSG_0015)
+            pass
+        try:
+            if self.element_model.type == ElementOperationEnum.OPE.value:
+                self.__ope()
+            elif self.element_model.type == ElementOperationEnum.ASS.value:
+                self.__ass()
+            elif self.element_model.type == ElementOperationEnum.SQL.value:
+                self.__sql()
+            elif self.element_model.type == ElementOperationEnum.CUSTOM.value:
+                self.__custom()
+            else:
+                raise MangoAutomationError(*ERROR_MSG_0015)
+        except TargetClosedError as error:
+            self.base_data.setup()
+            self.base_data.log.debug(
+                f'浏览器关闭异常，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+            raise MangoAutomationError(*ERROR_MSG_0010)
 
     def __ope(self):
         method_name = getattr(self.element_model, 'ope_key', None)
@@ -122,7 +127,6 @@ class SyncElement(SyncWebDevice, AndroidDriver):
             raise MangoAutomationError(*ERROR_MSG_0048)
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
-
         self.__ope_value()
         if self.drive_type == DriveTypeEnum.WEB.value:
             self.web_action_element(
@@ -208,18 +212,15 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                         'sub': self.element_model.sub
                     }
                     if self.drive_type == DriveTypeEnum.WEB.value:
-                        loc, \
-                            self.element_result_model.ele_quantity, \
+                        loc, self.element_result_model.ele_quantity, \
                             self.element_result_model.element_text \
                             = self.web_find_ele(**find_params, is_iframe=self.element_model.is_iframe)
                     elif self.drive_type == DriveTypeEnum.ANDROID.value:
-                        loc, \
-                            self.element_result_model.ele_quantity, \
+                        loc, self.element_result_model.ele_quantity, \
                             self.element_result_model.element_text \
                             = self.a_find_ele(**find_params)
                     else:
-                        loc, \
-                            self.element_result_model.ele_quantity, \
+                        loc, self.element_result_model.ele_quantity, \
                             self.element_result_model.element_text \
                             = None, 0, None
 

{mangoautomation-1.0.34 → mangoautomation-1.0.36}/mangoautomation/uidrive/web/async_web/_browser.py

@@ -44,6 +44,7 @@ class AsyncWebBrowser(metaclass=Meta):
             self.base_data.log.debug(f'打开URL失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0013, value=(url,))
         except TargetClosedError as error:
+            self.base_data.setup()
             self.base_data.log.debug(f'打开URL失败-2，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0010, value=(url,))
         except Error as error:

{mangoautomation-1.0.34 → mangoautomation-1.0.36}/mangoautomation/uidrive/web/async_web/_element.py

@@ -60,6 +60,14 @@ class AsyncWebElement(metaclass=Meta):
             self.base_data.test_data.set_cache(key=set_cache_key, value=value)
         return value
 
+    @async_method_callback('web', '元素操作', 5, [
+        MethodModel(f='locating'),
+        MethodModel(f='input_value', p='请输入输入内容', d=True)])
+    async def w_clear_input(self, locating: Locator, input_value: str):
+        """元素清空再输入"""
+        await locating.clear()
+        await locating.fill(str(input_value))
+
     @async_method_callback('web', '元素操作', 6, [MethodModel(f='locating')])
     async def w_many_click(self, locating: Locator):
         """多元素循环单击"""

{mangoautomation-1.0.34 → mangoautomation-1.0.36}/mangoautomation/uidrive/web/sync_web/_browser.py

@@ -44,6 +44,7 @@ class SyncWebBrowser(metaclass=Meta):
             self.base_data.log.debug(f'打开URL失败-2，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0013, value=(url,))
         except TargetClosedError as error:
+            self.base_data.setup()
             self.base_data.log.debug(f'打开URL失败-2，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0010, value=(url,))
         except Error as error:

{mangoautomation-1.0.34 → mangoautomation-1.0.36}/mangoautomation/uidrive/web/sync_web/_element.py

@@ -5,10 +5,10 @@
 import os
 
 import time
-from mangotools.decorator import sync_method_callback
-from mangotools.models import MethodModel
 from playwright.sync_api import Locator, Error
 
+from mangotools.decorator import sync_method_callback
+from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
 from ....exceptions._error_msg import ERROR_MSG_0024, ERROR_MSG_0056
 from ....tools import Meta
@@ -59,6 +59,14 @@ class SyncWebElement(metaclass=Meta):
             self.base_data.test_data.set_cache(key=set_cache_key, value=value)
         return value
 
+    @sync_method_callback('web', '元素操作', 5, [
+        MethodModel(f='locating'),
+        MethodModel(f='input_value', p='请输入输入内容', d=True)])
+    def w_clear_input(self, locating: Locator, input_value: str):
+        """元素清空再输入"""
+        locating.clear()
+        locating.fill(str(input_value))
+
     @sync_method_callback('web', '元素操作', 6, [MethodModel(f='locating')])
     def w_many_click(self, locating: Locator):
         """多元素循环单击"""

{mangoautomation-1.0.34 → mangoautomation-1.0.36/mangoautomation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.34
+Version: 1.0.36
 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.1
+Requires-Dist: mangotools==1.0.22
 Requires-Dist: adbutils~=2.8.9
 
 # testkit

{mangoautomation-1.0.34 → mangoautomation-1.0.36}/mangoautomation.egg-info/requires.txt

@@ -3,5 +3,5 @@ pydantic==2.9.2
 playwright==1.43.0
 uiautomation==2.0.20
 uiautomator2==3.2.5
-mangotools==1.0.1
+mangotools==1.0.22
 adbutils~=2.8.9

{mangoautomation-1.0.34 → mangoautomation-1.0.36}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = '1.0.34'
+__version__ = '1.0.36'
 
 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.1',
+        'mangotools==1.0.22',
         'adbutils~=2.8.9',
 
     ],