Kea2-python 0.2.1__tar.gz → 0.2.2__tar.gz

{kea2_python-0.2.1 → kea2_python-0.2.2}/Kea2_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 0.2.1
+Version: 0.2.2
 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
@@ -20,7 +20,7 @@ Dynamic: license-file
 
 
 <div>
-    <img src="https://github.com/user-attachments/assets/aa5839fc-4542-46f6-918b-c9f891356c84" style="border-radius: 14px; width: 20%; height: 20%;"/> 
+    <img src="https://github.com/user-attachments/assets/36ec9f2f-a3d8-482a-9a61-4785f3278991" style="border-radius: 14px; width: 20%; height: 20%;"/> 
 </div>
 
 ### Github repo link

{kea2_python-0.2.1 → kea2_python-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 0.2.1
+Version: 0.2.2
 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
@@ -20,7 +20,7 @@ Dynamic: license-file
 
 
 <div>
-    <img src="https://github.com/user-attachments/assets/aa5839fc-4542-46f6-918b-c9f891356c84" style="border-radius: 14px; width: 20%; height: 20%;"/> 
+    <img src="https://github.com/user-attachments/assets/36ec9f2f-a3d8-482a-9a61-4785f3278991" style="border-radius: 14px; width: 20%; height: 20%;"/> 
 </div>
 
 ### Github repo link

{kea2_python-0.2.1 → kea2_python-0.2.2}/README.md

@@ -6,7 +6,7 @@
 
 
 <div>
-    <img src="https://github.com/user-attachments/assets/aa5839fc-4542-46f6-918b-c9f891356c84" style="border-radius: 14px; width: 20%; height: 20%;"/> 
+    <img src="https://github.com/user-attachments/assets/36ec9f2f-a3d8-482a-9a61-4785f3278991" style="border-radius: 14px; width: 20%; height: 20%;"/> 
 </div>
 
 ### Github repo link

{kea2_python-0.2.1 → kea2_python-0.2.2}/kea2/fastbotManager.py

@@ -70,6 +70,21 @@ class FastbotManager:
             "/data/local/tmp/x86_64/libfastbot_native.so",
         )
 
+        whitelist = self.options.act_whitelist_file
+        blacklist = self.options.act_blacklist_file
+        if bool(whitelist) ^ bool(blacklist):
+            if whitelist:
+                file_to_push = cur_dir.parent / 'configs' / 'awl.strings'
+                remote_path = whitelist
+            else:
+                file_to_push = cur_dir.parent / 'configs' / 'abl.strings'
+                remote_path = blacklist
+
+            self.dev.sync.push(
+                file_to_push,
+                remote_path
+            )
+
         t = self._startFastbotService()
         logger.info("Running Fastbot...")
 
@@ -167,6 +182,14 @@ class FastbotManager:
         if self.options.profile_period:
             shell_command += ["--profile-period", f"{self.options.profile_period}"]
 
+        whitelist = self.options.act_whitelist_file
+        blacklist = self.options.act_blacklist_file
+        if bool(whitelist) ^ bool(blacklist):
+            if whitelist:
+                shell_command += ["--act-whitelist-file", f"{whitelist}"]
+            else:
+                shell_command += ["--act-blacklist-file", f"{blacklist}"]
+
         shell_command += ["-v", "-v", "-v"]
 
         full_cmd = ["adb"] + (["-s", self.options.serial] if self.options.serial else []) + ["shell"] + shell_command

{kea2_python-0.2.1 → kea2_python-0.2.2}/kea2/keaUtils.py

@@ -9,14 +9,15 @@ import random
 import warnings
 from dataclasses import dataclass, asdict
 import requests
-from .absDriver import AbstractDriver
+from kea2.absDriver import AbstractDriver
 from functools import wraps
-from .bug_report_generator import BugReportGenerator
-from .resultSyncer import ResultSyncer
-from .logWatcher import LogWatcher
-from .utils import TimeStamp, getProjectRoot, getLogger
-from .u2Driver import StaticU2UiObject
-from .fastbotManager import FastbotManager
+from kea2.bug_report_generator import BugReportGenerator
+from kea2.resultSyncer import ResultSyncer
+from kea2.logWatcher import LogWatcher
+from kea2.utils import TimeStamp, getProjectRoot, getLogger
+from kea2.u2Driver import StaticU2UiObject
+from kea2.fastbotManager import FastbotManager
+from kea2.adbUtils import ADBDevice
 import uiautomator2 as u2
 import types
 
@@ -133,6 +134,10 @@ class Options:
     device_output_root: str = "/sdcard"
     # the debug mode
     debug: bool = False
+    # Activity WhiteList File
+    act_whitelist_file: str = None
+    # Activity BlackList File
+    act_blacklist_file: str = None
 
     def __setattr__(self, name, value):
         if value is None:
@@ -149,6 +154,7 @@ class Options:
             if self.transport_id:
                 target_device["transport_id"] = self.transport_id
             self.Driver.setDevice(target_device)
+            ADBDevice.setDevice(self.serial, self.transport_id)
         global LOGFILE, RESFILE, STAMP
         if self.log_stamp:
             illegal_chars = ['/', '\\', ':', '*', '?', '"', '<', '>', '|', '\n', '\r', '\t', '\0']
@@ -170,12 +176,11 @@ class Options:
         if self.throttle < 0:
             raise ValueError("--throttle should be greater than or equal to 0")
 
-        _check_package_installation(self.serial, self.packageNames)
+        _check_package_installation(self.packageNames)
 
 
-def _check_package_installation(serial, packageNames):
-    from .adbUtils import get_packages
-    installed_packages = get_packages(device=serial)
+def _check_package_installation(packageNames):
+    installed_packages = set(ADBDevice().list_packages())
 
     for package in packageNames:
         if package not in installed_packages:

{kea2_python-0.2.1 → kea2_python-0.2.2}/kea2/kea_launcher.py

@@ -122,6 +122,22 @@ def _set_runner_parser(subparsers: "argparse._SubParsersAction[argparse.Argument
         help="Take screenshots for every step.",
     )
 
+    parser.add_argument(
+        "--act-whitelist-file",
+        dest="act_whitelist_file",
+        required=False,
+        type=str,
+        help="Add Activity Whitelist File.",
+    )
+
+    parser.add_argument(
+        "--act-blacklist-file",
+        dest="act_blacklist_file",
+        required=False,
+        type=str,
+        help="Add Activity Blacklist File.",
+    )
+
     parser.add_argument(
         "extra",
         nargs=argparse.REMAINDER,
@@ -195,7 +211,9 @@ def run(args=None):
         log_stamp=args.log_stamp,
         profile_period=args.profile_period,
         take_screenshots=args.take_screenshots,
-        device_output_root=args.device_output_root
+        device_output_root=args.device_output_root,
+        act_whitelist_file = args.act_whitelist_file,
+        act_blacklist_file=args.act_blacklist_file
     )
 
     KeaTestRunner.setOptions(options)

{kea2_python-0.2.1 → kea2_python-0.2.2}/kea2/logWatcher.py

@@ -24,7 +24,7 @@ class LogWatcher:
     def watcher(self, poll_interval=3):
         self.last_pos = 0
 
-        with open(self.log_file, "r") as fp:
+        with open(self.log_file, "r", encoding="utf-8") as fp:
             while not self.end_flag:
                 self.read_log(fp)
                 time.sleep(poll_interval)

{kea2_python-0.2.1 → kea2_python-0.2.2}/kea2/u2Driver.py

@@ -285,13 +285,14 @@ class _HindenWidgetFilter:
 
 
 class U2StaticDevice(u2.Device):
-    def __init__(self, script_driver):
+    def __init__(self, script_driver=None):
         self.xml: etree._Element = None
         self._script_driver = script_driver
 
     def __call__(self, **kwargs):
         ui = StaticU2UiObject(session=self, selector=u2.Selector(**kwargs))
-        ui.jsonrpc = self._script_driver.jsonrpc
+        if self._script_driver:
+            ui.jsonrpc = self._script_driver.jsonrpc
         return ui
 
     @property

{kea2_python-0.2.1 → kea2_python-0.2.2}/pyproject.toml

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

{kea2_python-0.2.1 → kea2_python-0.2.2}/tests/test_u2Selector.py

@@ -1,16 +1,22 @@
 import unittest
-from kea2.u2Driver import _HindenWidgetFilter, U2Driver
+from kea2.u2Driver import U2StaticChecker, U2StaticDevice
 from lxml import etree
 from pathlib import Path
 
 
+
 XML_PATH = Path(__file__).parent / "hidden_widget_test.xml"
 
 
+class U2StaticCheckerForTest(U2StaticChecker):
+    def __init__(self):
+        self.d = U2StaticDevice(script_driver=None)
+
+
 def get_static_checker():
     xml: etree._ElementTree = etree.parse(XML_PATH)
-    d = U2Driver.getStaticChecker(xml)
-    return d
+    d = U2StaticCheckerForTest()
+    return d.getInstance(xml)
 
 
 class TestHiddenWidget(unittest.TestCase):