Kea2-python 0.0.1a0__tar.gz → 0.0.1a1__tar.gz

{kea2_python-0.0.1a0 → kea2_python-0.0.1a1}/Kea2_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 0.0.1a0
+Version: 0.0.1a1
 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.9

{kea2_python-0.0.1a0 → kea2_python-0.0.1a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 0.0.1a0
+Version: 0.0.1a1
 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.9

kea2_python-0.0.1a1/kea2/assets/fastbot_configs/widget.block.py

@@ -0,0 +1,18 @@
+from kea2.utils import Device
+from kea2.keaUtils import precondition
+
+
+def global_block_widgets(d: "Device"):
+    """
+    global block widgets.
+    return the widgets you want to block globally
+    only available in mode `u2 agent`
+    """
+    return []
+
+
+# conditional block list
+@precondition(lambda d: d(text="In the home page").exists)
+def block_sth(d: "Device"):
+    # Important: function shold starts with "block"
+    return [d(text="widgets to block"), d.xpath(".//node[@text='widget to block']")]

{kea2_python-0.0.1a0 → kea2_python-0.0.1a1}/kea2/cli.py

@@ -2,6 +2,7 @@
 # cli.py
 
 from __future__ import absolute_import, print_function
+import sys
 from kea2.utils import getProjectRoot, getLogger
 from .kea_launcher import run
 import argparse
@@ -43,9 +44,7 @@ def cmd_run(args):
     if base_dir is None:
         logger.error("kea2 project not initialized. Use `kea2 init`.")
         return
-    argv = [__file__]
-    argv.extend(args.args)
-    run(argv)
+    run(args)
 
 
 def cmd_install(args):
@@ -83,14 +82,14 @@ _commands = [
         command="init",
         help="init the Kea2 project in current directory",
     ),
-    dict(
-        action=cmd_run,
-        command="run",
-        help="run kea2",
-        flags=[
-            dict(args=["args"], nargs=argparse.REMAINDER, help="args for kea2 run"),
-        ],
-    ),
+    # dict(
+    #     action=cmd_run,
+    #     command="run",
+    #     help="run kea2",
+    #     flags=[
+    #         dict(args=["args"], nargs=argparse.REMAINDER),
+    #     ],
+    # ),
     # dict(
     #     action=cmd_install,
     #     command="",
@@ -157,11 +156,17 @@ def main():
             kwargs.pop('args', None)
             sp.add_argument(*args, **kwargs)
 
+    from .kea_launcher import _set_driver_parser
+    _set_driver_parser(subparser)
+    actions["run"] = cmd_run
+    if sys.argv[1:] == ["run"]:
+        sys.argv.append("-h")
     args = parser.parse_args()
-    
 
+    import logging
+    logging.getLogger("urllib3").setLevel(logging.INFO)
+    logging.getLogger("uiautomator2").setLevel(logging.INFO)
     if args.debug:
-        import logging
         logging.basicConfig(level=logging.DEBUG)
         logger.debug("args: %s", args)
 

{kea2_python-0.0.1a0 → kea2_python-0.0.1a1}/kea2/keaUtils.py

@@ -15,6 +15,8 @@ from time import sleep
 from .adbUtils import push_file
 from .logWatcher import LogWatcher
 from .utils import TimeStamp, getProjectRoot, getLogger
+from .u2Driver import StaticU2UiObject
+import uiautomator2 as u2
 import types
 PRECONDITIONS_MARKER = "preconds"
 PROP_MARKER = "prop"
@@ -404,8 +406,14 @@ class KeaTestRunner(TextTestRunner):
         """
         send a step monkey request to the server and get the xml string.
         """
-        block_widgets = self._getBlockedWidgets()
-        r = requests.get(f"http://localhost:{self.scriptDriver.lport}/stepMonkey")
+        block_widgets: List[str] = self._getBlockedWidgets()
+        URL = f"http://localhost:{self.scriptDriver.lport}/stepMonkey"
+        r = requests.post(
+            url=URL,
+            json={
+                "block_widgets": block_widgets
+            }
+        )
 
         res = json.loads(r.content)
         xml_raw = res["result"]
@@ -479,7 +487,7 @@ class KeaTestRunner(TextTestRunner):
                 print(f"[INFO] Load property: {getFullPropName(t)}", flush=True)
     
     @property
-    def blockList(self):
+    def _blockWidgetFuncs(self):
         if self._block_widgets_funcs is None:
             self._block_widgets_funcs = list()
             root_dir = getProjectRoot()
@@ -512,7 +520,7 @@ class KeaTestRunner(TextTestRunner):
 
     def _getBlockedWidgets(self):
         blocked_widgets = list()
-        for func in self.blockList:
+        for func in self._blockWidgetFuncs:
             try:
                 script_driver = self.options.Driver.getScriptDriver()
                 preconds = getattr(func, PRECONDITIONS_MARKER)
@@ -520,9 +528,18 @@ class KeaTestRunner(TextTestRunner):
                     _widgets = func(self.options.Driver.getStaticChecker())
                     if not isinstance(_widgets, list):
                         _widgets = [_widgets]
-                    blocked_widgets.extend([
-                        w._getXPath(w.selector) for w in _widgets
-                    ])
+                    for w in _widgets:
+                        if isinstance(w, StaticU2UiObject):
+                            blocked_widgets.append(w._getXPath(w.selector))
+                        elif isinstance(w, u2.xpath.XPathSelector):
+                            def getXPathRepr(w):
+                                return w._parent.xpath
+                            blocked_widgets.append(getXPathRepr(w))
+                        else:
+                            logger.warning(f"{w} Not supported")
+                    # blocked_widgets.extend([
+                    #     w._getXPath(w.selector) for w in _widgets
+                    # ])
             except Exception as e:
                 logger.error(f"error when getting blocked widgets: {e}")
                 import traceback

{kea2_python-0.0.1a0 → kea2_python-0.0.1a1}/kea2/kea_launcher.py

@@ -1,9 +1,10 @@
+import sys
 import argparse
-from typing import List
 import unittest
+from typing import List
 
 def _set_driver_parser(subparsers: "argparse._SubParsersAction[argparse.ArgumentParser]"):
-    parser = subparsers.add_parser("driver", help="Driver Settings")
+    parser = subparsers.add_parser("run", help="run kea2")
     parser.add_argument(
         "-s",
         "--serial",
@@ -96,21 +97,28 @@ def parse_args(argv: List):
     subparsers = parser.add_subparsers(dest="command", required=True)
 
     _set_driver_parser(subparsers)
-    if len(argv) == 0:
-        argv.append("-h")
     args = parser.parse_args(argv)
-    driver_info_logger(args)
-    unittest_info_logger(args)
     return args
 
-def run(argv=None):
-    import sys
-    if argv is None:
-        argv = sys.argv
-    args = parse_args(argv[1:])
+def _sanitize_args(args):
+    if args.agent == "u2" and not args.driver_name:
+        if args.extra == []:
+            args.driver_name = "d"
+        else:
+            raise ValueError("--driver-name should be specified when customizing script in --agent u2")
+
+def run(args=None):
+    if args is None:
+        args = parse_args(sys.argv[1:])
+
+    _sanitize_args(args)
+
+    driver_info_logger(args)
+    unittest_info_logger(args)
 
     from kea2 import KeaTestRunner, Options
     from kea2.u2Driver import U2Driver
+    U2Driver.setDeviceSerial(args.serial)
     options = Options(
         agent=args.agent,
         driverName=args.driver_name,

{kea2_python-0.0.1a0 → kea2_python-0.0.1a1}/kea2/u2Driver.py

@@ -85,7 +85,8 @@ class StaticU2UiObject(u2.UiObject):
 
     def _transferU2Keys(self, originKey):
         filterDict = {
-            "resourceId": "resource-id"
+            "resourceId": "resource-id",
+            "description": "content-desc"
         }
         if filterDict.get(originKey, None):
             return filterDict[originKey]
@@ -116,7 +117,7 @@ class StaticU2UiObject(u2.UiObject):
 
     @property
     def exists(self):
-        self.selector["covered"] = "true"
+        dict.update(self.selector, {"covered": "true"})
         xpath = self._getXPath(self.selector)
         matched_widgets = self.session.xml.xpath(xpath)
         return bool(matched_widgets)
@@ -124,7 +125,7 @@ class StaticU2UiObject(u2.UiObject):
     def __len__(self):
         xpath = self._getXPath(self.selector)
         matched_widgets = self.session.xml.xpath(xpath)
-        return len(matched_widgets)   
+        return len(matched_widgets)
 
 
 def _get_bounds(raw_bounds):
@@ -216,12 +217,21 @@ class U2StaticDevice(u2.Device):
         def get_page_source(self):
             # print("[Debug] Using static get_page_source method")
             return u2.xpath.PageSource.parse(self._d.xml_raw)
-        xpathEntry = u2.xpath.XPathEntry(self)
+        xpathEntry = _XPathEntry(self)
         xpathEntry.get_page_source = types.MethodType(
             get_page_source, xpathEntry
         )
         return xpathEntry
 
+class _XPathEntry(u2.xpath.XPathEntry):
+    def __init__(self, d):
+        self.xpath = None
+        super().__init__(d)
+        
+    def __call__(self, xpath, source = None):
+        self.xpath = xpath
+        return super().__call__(xpath, source)
+
 
 class U2StaticChecker(AbstractStaticChecker):
     """

{kea2_python-0.0.1a0 → kea2_python-0.0.1a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Kea2-python"
-version = "0.0.1a"
+version = "0.0.1a1"
 description = "A python library for supporting and customizing automated UI testing for mobile apps"
 readme = "README.md"
 requires-python = ">=3.9"

kea2_python-0.0.1a0/kea2/assets/fastbot_configs/widget.block.py

@@ -1,22 +0,0 @@
-from kea2.utils import precondition
-from uiautomator2 import Device
-
-
-@precondition(lambda d:
-    d(text="Setting")
-)
-def sample_block_list(d: "Device"):
-    return d(text="Omni Notes Alpha").exists
-
-
-if __name__ == "__main__":
-    from kea2.utils import BLOCK_WIDGET
-    func = getattr(sample_block_list, BLOCK_WIDGET)
-    import uiautomator2 as u2
-    d = u2.connect()
-    blocked_widgets = func(d)
-    if isinstance(blocked_widgets, u2.UiObject):
-        blocked_widgets = [blocked_widgets]
-    if not all([isinstance(w, u2.UiObject) for w in blocked_widgets]):
-        raise TypeError(f"Invalid widgets block list in {sample_block_list}")
-