Kea2-python 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

kea2/keaUtils.py

@@ -14,7 +14,7 @@ from .bug_report_generator import BugReportGenerator
 from .resultSyncer import ResultSyncer
 from .logWatcher import LogWatcher
 from .utils import TimeStamp, getProjectRoot, getLogger
-from .u2Driver import StaticU2UiObject, selector_to_xpath
+from .u2Driver import StaticU2UiObject
 from .fastbotManager import FastbotManager
 import uiautomator2 as u2
 import types
@@ -344,8 +344,6 @@ class KeaTestRunner(TextTestRunner):
                     if self.options.profile_period and self.stepsCount % self.options.profile_period == 0:
                         resultSyncer.sync_event.set()
 
-                    print(f"{len(propsSatisfiedPrecond)} precond satisfied.", flush=True)
-
                     # Go to the next round if no precond satisfied
                     if len(propsSatisfiedPrecond) == 0:
                         continue
@@ -478,18 +476,25 @@ class KeaTestRunner(TextTestRunner):
                     if not precond(test):
                         valid = False
                         break
+                except u2.UiObjectNotFoundError as e:
+                    valid = False
+                    break
                 except Exception as e:
-                    print(f"[ERROR] Error when checking precond: {getFullPropName(test)}", flush=True)
+                    logger.error(f"Error when checking precond: {getFullPropName(test)}")
                     traceback.print_exc()
                     valid = False
                     break
             # if all the precond passed. make it the candidate prop.
             if valid:
-                logger.debug(f"precond satisfied: {getFullPropName(test)}")
                 if result.getExcuted(test) >= getattr(prop, MAX_TRIES_MARKER, float("inf")):
-                    logger.debug(f"{getFullPropName(test)} has reached its max_tries. Skip.")
+                    print(f"{getFullPropName(test)} has reached its max_tries. Skip.", flush=True)
                     continue
                 validProps[propName] = test
+        
+        print(f"{len(validProps)} precond satisfied.", flush=True)
+        if len(validProps) > 0:
+            print("[INFO] Valid properties:",flush=True)
+            print("\n".join([f'                - {getFullPropName(p)}' for p in validProps.values()]), flush=True)
         return validProps
 
     def _logScript(self, execution_info:Dict):
@@ -619,46 +624,56 @@ class KeaTestRunner(TextTestRunner):
            """
         def _get_xpath_widgets(func):
             blocked_set = set()
-            try:
-                script_driver = self.options.Driver.getScriptDriver()
-                preconds = getattr(func, PRECONDITIONS_MARKER, [])
-                if all(precond(script_driver) for precond in preconds):
+            script_driver = self.options.Driver.getScriptDriver()
+            preconds = getattr(func, PRECONDITIONS_MARKER, [])
+
+            def preconds_pass(preconds):
+                try:
+                    return all(precond(script_driver) for precond in preconds)
+                except u2.UiObjectNotFoundError as e:
+                    return False
+                except Exception as e:
+                    logger.error(f"Error processing precond. Check if precond: {e}")
+                    traceback.print_exc()
+                    return False
+
+            if preconds_pass(preconds):
+                try:
                     _widgets = func(self.options.Driver.getStaticChecker())
                     _widgets = _widgets if isinstance(_widgets, list) else [_widgets]
                     for w in _widgets:
                         if isinstance(w, StaticU2UiObject):
-                            xpath = selector_to_xpath(w.selector, True)
-                            blocked_set.add(xpath)
+                            xpath = w.selector_to_xpath(w.selector)
+                            if xpath != '//error':
+                                blocked_set.add(xpath)
                         elif isinstance(w, u2.xpath.XPathSelector):
                             xpath = w._parent.xpath
                             blocked_set.add(xpath)
                         else:
-                            logger.warning(f"{w} Not supported")
-            except Exception as e:
-                logger.error(f"Error processing blocked widgets: {e}")
-                traceback.print_exc()
+                            logger.error(f"block widget defined in {func.__name__} Not supported.")
+                except Exception as e:
+                    logger.error(f"Error processing blocked widgets in: {func}")
+                    logger.error(e)
+                    traceback.print_exc()
             return blocked_set
 
-        res = {
+        result = {
             "widgets": set(),
             "trees": set()
         }
 
-
         for func in self._blockWidgetFuncs["widgets"]:
             widgets = _get_xpath_widgets(func)
-            res["widgets"].update(widgets)
-
+            result["widgets"].update(widgets)
 
         for func in self._blockWidgetFuncs["trees"]:
             trees = _get_xpath_widgets(func)
-            res["trees"].update(trees)
+            result["trees"].update(trees)
 
+        result["widgets"] = list(result["widgets"] - result["trees"])
+        result["trees"] = list(result["trees"])
 
-        res["widgets"] = list(res["widgets"] - res["trees"])
-        res["trees"] = list(res["trees"])
-
-        return res
+        return result
 
 
     def __del__(self):

kea2/u2Driver.py

@@ -100,39 +100,105 @@ class StaticU2UiObject(u2.UiObject):
             return filterDict[originKey]
         return originKey
 
-    def _getXPath(self, kwargs: Dict[str, str]):
+    def selector_to_xpath(self, selector: u2.Selector, is_initial: bool = True) -> str:
+        """
+            Convert a u2 Selector into an XPath expression compatible with Java Android UI controls.
 
-        def filter_selectors(kwargs: Dict[str, str]):
-            """
-            filter the selector
-            """
-            new_kwargs = dict()
-            SPECIAL_KEY = {"mask", "childOrSibling", "childOrSiblingSelector"}
-            for key, val in kwargs.items():
-                if key in SPECIAL_KEY:
-                    continue
-                key = self._transferU2Keys(key)
-                new_kwargs[key] = val
-            return new_kwargs
+            Args:
+                selector (u2.Selector): A u2 Selector object
+                is_initial (bool): Whether it is the initial node, defaults to True
 
-        kwargs = filter_selectors(kwargs)
+            Returns:
+                str: The corresponding XPath expression
+            """
+        try:
 
-        attrLocs = [
-            f"[@{k}='{v}']" for k, v in kwargs.items()
-        ]
-        xpath = f".//node{''.join(attrLocs)}"
-        return xpath
+            xpath = ".//node" if is_initial else "node"
+
+            conditions = []
+
+            if "className" in selector:
+                conditions.insert(0, f"[@class='{selector['className']}']")
+
+            if "text" in selector:
+                conditions.append(f"[@text='{selector['text']}']")
+            elif "textContains" in selector:
+                conditions.append(f"[contains(@text, '{selector['textContains']}')]")
+            elif "textStartsWith" in selector:
+                conditions.append(f"[starts-with(@text, '{selector['textStartsWith']}')]")
+            elif "textMatches" in selector:
+                raise NotImplementedError("'textMatches' syntax is not supported")
+
+            if "description" in selector:
+                conditions.append(f"[@content-desc='{selector['description']}']")
+            elif "descriptionContains" in selector:
+                conditions.append(f"[contains(@content-desc, '{selector['descriptionContains']}')]")
+            elif "descriptionStartsWith" in selector:
+                conditions.append(f"[starts-with(@content-desc, '{selector['descriptionStartsWith']}')]")
+            elif "descriptionMatches" in selector:
+                raise NotImplementedError("'descriptionMatches' syntax is not supported")
+
+            if "packageName" in selector:
+                conditions.append(f"[@package='{selector['packageName']}']")
+            elif "packageNameMatches" in selector:
+                raise NotImplementedError("'packageNameMatches' syntax is not supported")
+
+            if "resourceId" in selector:
+                conditions.append(f"[@resource-id='{selector['resourceId']}']")
+            elif "resourceIdMatches" in selector:
+                raise NotImplementedError("'resourceIdMatches' syntax is not supported")
+
+            bool_props = ["checkable", "checked", "clickable", "longClickable", "scrollable", "enabled", "focusable",
+                          "focused", "selected", "covered"]
+
+            def str_to_bool(value):
+                """Convert string 'true'/'false' to boolean, or return original value if already boolean"""
+                if isinstance(value, str):
+                    return value.lower() == "true"
+                return bool(value)
+
+            for prop in bool_props:
+                if prop in selector:
+                    bool_value = str_to_bool(selector[prop])
+                    value = "true" if bool_value else "false"
+                    conditions.append(f"[@{prop}='{value}']")
+
+            if "index" in selector:
+                conditions.append(f"[@index='{selector['index']}']")
+
+            xpath += "".join(conditions)
+
+            if "childOrSibling" in selector and selector["childOrSibling"]:
+                for i, relation in enumerate(selector["childOrSibling"]):
+                    sub_selector = selector["childOrSiblingSelector"][i]
+                    sub_xpath = self.selector_to_xpath(sub_selector, False)
+
+                    if relation == "child":
+                        xpath += f"//{sub_xpath}"
+                    elif relation == "sibling":
+                        cur_root = xpath
+                        following_sibling = cur_root + f"/following-sibling::{sub_xpath}"
+                        preceding_sibling = cur_root + f"/preceding-sibling::{sub_xpath}"
+                        xpath = f"({following_sibling} | {preceding_sibling})"
+            if "instance" in selector:
+                xpath = f"({xpath})[{selector['instance'] + 1}]"
+
+            return xpath
+
+        except Exception as e:
+            print(f"Error occurred during selector conversion: {e}")
+            return "//error"
 
 
     @property
     def exists(self):
-        dict.update(self.selector, {"covered": "false"})
-        xpath = self._getXPath(self.selector)
+        set_covered_to_deepest_node(self.selector)
+        xpath = self.selector_to_xpath(self.selector)
         matched_widgets = self.session.xml.xpath(xpath)
         return bool(matched_widgets)
 
     def __len__(self):
-        xpath = self._getXPath(self.selector)
+        xpath = self.selector_to_xpath(self.selector)
         matched_widgets = self.session.xml.xpath(xpath)
         return len(matched_widgets)
     
@@ -141,6 +207,9 @@ class StaticU2UiObject(u2.UiObject):
     
     def sibling(self, **kwargs):
         return StaticU2UiObject(self.session, self.selector.clone().sibling(**kwargs))
+    
+    def __getattr__(self, attr):
+        return getattr(super(), attr)
 
 
 def _get_bounds(raw_bounds):
@@ -227,7 +296,9 @@ class U2StaticDevice(u2.Device):
         self._script_driver = script_driver
 
     def __call__(self, **kwargs):
-        return StaticU2UiObject(session=self, selector=u2.Selector(**kwargs))
+        ui = StaticU2UiObject(session=self, selector=u2.Selector(**kwargs))
+        ui.jsonrpc = self._script_driver.jsonrpc
+        return ui
 
     @property
     def xpath(self) -> u2.xpath.XPathEntry:
@@ -274,7 +345,12 @@ class U2StaticChecker(AbstractStaticChecker):
     def setHierarchy(self, hierarchy: str):
         if hierarchy is None:
             return
-        self.d.xml = etree.fromstring(hierarchy.encode("utf-8"))
+        if isinstance(hierarchy, str):
+            self.d.xml = etree.fromstring(hierarchy.encode("utf-8"))
+        elif isinstance(hierarchy, etree._Element):
+            self.d.xml = hierarchy
+        elif isinstance(hierarchy, etree._ElementTree):
+            self.d.xml = hierarchy.getroot()
         _HindenWidgetFilter(self.d.xml)
 
     def getInstance(self, hierarchy: str=None):
@@ -330,90 +406,6 @@ def forward_port(self, remote: Union[int, str]) -> int:
         logger.debug(f"forwading port: tcp:{local_port} -> {remote}")
         return local_port
 
-
-def selector_to_xpath(selector: u2.Selector, is_initial: bool = True) -> str:
-    """
-    Convert a u2 Selector into an XPath expression compatible with Java Android UI controls.
-
-    Args:
-        selector (u2.Selector): A u2 Selector object
-        is_initial (bool): Whether it is the initial node, defaults to True
-
-    Returns:
-        str: The corresponding XPath expression
-    """
-    try:
-        if is_initial:
-            xpath = ".//node"
-        else:
-            xpath = "node"
-
-        conditions = []
-
-        if "className" in selector:
-            conditions.insert(0, f"[@class='{selector['className']}']")  # 将 className 条件放在前面
-
-        if "text" in selector:
-            conditions.append(f"[@text='{selector['text']}']")
-        elif "textContains" in selector:
-            conditions.append(f"[contains(@text, '{selector['textContains']}')]")
-        elif "textMatches" in selector:
-            conditions.append(f"[re:match(@text, '{selector['textMatches']}')]")
-        elif "textStartsWith" in selector:
-            conditions.append(f"[starts-with(@text, '{selector['textStartsWith']}')]")
-
-        if "description" in selector:
-            conditions.append(f"[@content-desc='{selector['description']}']")
-        elif "descriptionContains" in selector:
-            conditions.append(f"[contains(@content-desc, '{selector['descriptionContains']}')]")
-        elif "descriptionMatches" in selector:
-            conditions.append(f"[re:match(@content-desc, '{selector['descriptionMatches']}')]")
-        elif "descriptionStartsWith" in selector:
-            conditions.append(f"[starts-with(@content-desc, '{selector['descriptionStartsWith']}')]")
-
-        if "packageName" in selector:
-            conditions.append(f"[@package='{selector['packageName']}']")
-        elif "packageNameMatches" in selector:
-            conditions.append(f"[re:match(@package, '{selector['packageNameMatches']}')]")
-
-        if "resourceId" in selector:
-            conditions.append(f"[@resource-id='{selector['resourceId']}']")
-        elif "resourceIdMatches" in selector:
-            conditions.append(f"[re:match(@resource-id, '{selector['resourceIdMatches']}')]")
-
-        bool_props = [
-            "checkable", "checked", "clickable", "longClickable", "scrollable",
-            "enabled", "focusable", "focused", "selected", "covered"
-        ]
-        for prop in bool_props:
-            if prop in selector:
-                value = "true" if selector[prop] else "false"
-                conditions.append(f"[@{prop}='{value}']")
-
-        if "index" in selector:
-            conditions.append(f"[@index='{selector['index']}']")
-        elif "instance" in selector:
-            conditions.append(f"[@instance='{selector['instance']}']")
-
-        xpath += "".join(conditions)
-
-        if "childOrSibling" in selector and selector["childOrSibling"]:
-            for i, relation in enumerate(selector["childOrSibling"]):
-                sub_selector = selector["childOrSiblingSelector"][i]
-                sub_xpath = selector_to_xpath(sub_selector, False)  # 递归处理子选择器
-
-                if relation == "child":
-                    xpath += f"/{sub_xpath}"
-                elif relation == "sibling":
-                    xpath_initial = xpath
-                    xpath = '(' + xpath_initial + f"/following-sibling::{sub_xpath} | " + xpath_initial + f"/preceding-sibling::{sub_xpath})"
-
-        return xpath
-
-    except Exception as e:
-        print(f"Error occurred during selector conversion: {e}")
-        return "//error"
-
 def is_port_in_use(port: int) -> bool:
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         return s.connect_ex(('127.0.0.1', port)) == 0
@@ -435,3 +427,25 @@ def get_free_port():
             if not is_port_in_use(port):
                 return port
         raise RuntimeError("No free port found")
+
+def set_covered_to_deepest_node(selector: u2.Selector):
+
+    def find_deepest_nodes(node):
+        deepest_node = None
+        is_leaf = True
+        if "childOrSibling" in node and node["childOrSibling"]:
+            for i, relation in enumerate(node["childOrSibling"]):
+                sub_selector = node["childOrSiblingSelector"][i]
+                deepest_node = find_deepest_nodes(sub_selector)
+                is_leaf = False
+
+        if is_leaf:
+            deepest_node = node
+        return deepest_node
+
+    deepest_node = find_deepest_nodes(selector)
+
+    if deepest_node is not None:
+        dict.update(deepest_node, {"covered": False})
+
+

{kea2_python-0.1.2.dist-info → kea2_python-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 0.1.2
+Version: 0.1.3
 Summary: A python library for supporting and customizing automated UI testing for mobile apps
 Author-email: Xixian Liang <xixian@stu.ecnu.edu.cn>
 Requires-Python: >=3.8
@@ -17,8 +17,9 @@ Dynamic: license-file
 [![PyPI Downloads](https://static.pepy.tech/badge/kea2-python)](https://pepy.tech/projects/kea2-python)
 ![Python](https://img.shields.io/badge/python-3.8%2B-blue)
 
+
 <div>
-    <img src="https://github.com/user-attachments/assets/1a64635b-a8f2-40f1-8f16-55e47b1d74e7" style="border-radius: 14px; width: 20%; height: 20%;"/> 
+    <img src="https://github.com/user-attachments/assets/aa5839fc-4542-46f6-918b-c9f891356c84" style="border-radius: 14px; width: 20%; height: 20%;"/> 
 </div>
 
 ## About

{kea2_python-0.1.2.dist-info → kea2_python-0.1.3.dist-info}/RECORD

@@ -4,11 +4,11 @@ kea2/adbUtils.py,sha256=j6goAAzV1Ikmv26DZEE0Oi8S1PrejcV1Io3u_Xw4ws4,9910
 kea2/bug_report_generator.py,sha256=G5h9nI1w1UaksjF3gkMC8UrXgiNmtU1D5VIuPiciOak,22792
 kea2/cli.py,sha256=YgWOe5JB0_WBTKyBShBEymhLIqj6K5gNR4Aaj6Pbtn0,2796
 kea2/fastbotManager.py,sha256=Ru7Aitcjlem52npJJLg-3KX5ctCoflaaLG4N0IgQ2QU,4828
-kea2/keaUtils.py,sha256=civETbAJaRJsVf7hb-ZKqcDRAaRfpxIdj0frBwyvsjk,25175
+kea2/keaUtils.py,sha256=XylgzSS4_DcQn3SjbJJ2bA82v0LQV1qmbgZPRjBh-ZE,25932
 kea2/kea_launcher.py,sha256=xDMHAzD2Ig2Dug9K4MzkTPwieKvLASmjUahEst8aaVU,5291
 kea2/logWatcher.py,sha256=qpIsflbP37eX5b4EaWnrqyPbGP9lzQhRr3ainGFfZeI,2211
 kea2/resultSyncer.py,sha256=f3qfne8WQCo1AA3cwx9IZzLdenjjMWbEpAqPdvddAqk,1984
-kea2/u2Driver.py,sha256=1uViwhQAkBFu69XFR5i8dSgG8SL3v7wZ68-t0E0Xlpw,14876
+kea2/u2Driver.py,sha256=__rP_d5uY029_eAxPNUiNw3lq8PVLf8QZRe3uwZEmb4,15779
 kea2/utils.py,sha256=8b4y-_B7knKRN_HqpWZM900IdRiZXwmzQnduVVN0GxQ,1384
 kea2/assets/fastbot-thirdpart.jar,sha256=0SZ_OoZFWDGMnazgXKceHgKvXdUDoIa3Gb2bcifaikk,85664
 kea2/assets/framework.jar,sha256=rTluOJJKj2DFwh7ascXso1udYdWv00BxBwSQ3Vmv-fw,1149240
@@ -28,9 +28,9 @@ kea2/assets/fastbot_libs/armeabi-v7a/libfastbot_native.so,sha256=UV8bhaiPoPKdd3q
 kea2/assets/fastbot_libs/x86/libfastbot_native.so,sha256=k-aw1gEXRWMKZRNHIggKNuZy0wC1y2BnveJGEIO6rbo,2036856
 kea2/assets/fastbot_libs/x86_64/libfastbot_native.so,sha256=tiofhlf4uMQcU5WAvrdLgTBME0lb83hVUoGtTwxmE8A,2121416
 kea2/templates/bug_report_template.html,sha256=sQ0Uu8SPeOIiyX5vPPTZPVKxh9-9raAZcCjSRS8YFe0,40624
-kea2_python-0.1.2.dist-info/licenses/LICENSE,sha256=nM9PPjcsXVo5SzNsjRqWgA-gdJlwqZZcRDSC6Qf6bVE,2034
-kea2_python-0.1.2.dist-info/METADATA,sha256=uVrc81g1R20PPcsSn2cJg7tuAZ84GnGcL8kMI1Hfrys,13233
-kea2_python-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kea2_python-0.1.2.dist-info/entry_points.txt,sha256=mFX06TyxXiUAJQ6JZn8QHzfn8n5R8_KJ5W-pTm_fRCA,39
-kea2_python-0.1.2.dist-info/top_level.txt,sha256=TsgNH4PQoNOVhegpO7AcjutMVWp6Z4KDL1pBH9FnMmk,5
-kea2_python-0.1.2.dist-info/RECORD,,
+kea2_python-0.1.3.dist-info/licenses/LICENSE,sha256=nM9PPjcsXVo5SzNsjRqWgA-gdJlwqZZcRDSC6Qf6bVE,2034
+kea2_python-0.1.3.dist-info/METADATA,sha256=Y2ICVucbBO8JybwZMNKtTQSl_rJdndmKkD4PAVPwQWk,13234
+kea2_python-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kea2_python-0.1.3.dist-info/entry_points.txt,sha256=mFX06TyxXiUAJQ6JZn8QHzfn8n5R8_KJ5W-pTm_fRCA,39
+kea2_python-0.1.3.dist-info/top_level.txt,sha256=TsgNH4PQoNOVhegpO7AcjutMVWp6Z4KDL1pBH9FnMmk,5
+kea2_python-0.1.3.dist-info/RECORD,,