Kea2-python 1.1.0__tar.gz → 1.1.0b1__tar.gz

{kea2_python-1.1.0 → kea2_python-1.1.0b1}/Kea2_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 1.1.0
+Version: 1.1.0b1
 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
@@ -290,7 +290,7 @@ Some notes:
 3. You need to insert the following code template into your existing test cases: Here, you can add your own hook logic in the commented sections, including starting or stopping the appium session, cleaning up instances, etc. This depends on how you want to design the setup and teardown. Apart from that, you only need to configure the `option` parameter and `configs_path` parameter(where your directory `configs` located, btw, `configs`'s location dependon where you executed `kea2 init`), then pass it to the `run_kea2_testing` function.
 
 ```python
-from kea2 import Kea2Tester, Options
+from kea2 import Kea2Tester, Options, U2Driver
 
 if os.environ.get('KEA2_HYBRID_MODE', '').lower() == 'true': 
     '''
@@ -327,10 +327,6 @@ if os.environ.get('KEA2_HYBRID_MODE', '').lower() == 'true':
 Kea2 automatically generates a HTML test report after each testing session. You can find the report in `output/` under your working directory.
 
 You can also manually generate the test report by `kea2 report` (see `kea2 report -h` for details).
-Use `-s/--sync` to sync data from device before generating the report, and `-p/--path` to point to one or more result directories.
-For example:
-`kea2 report -p output/res_YYYYMMDDHH_xxxxxx`
-`kea2 report -s -p output/res_YYYYMMDDHH_xxxxxx`
 
 You can also merge the test report from multiple testing sessions by `kea2 merge` (see `kea2 merge -h` for details).
 The merged test report is quite useful if you would test your apps for multiple sessions.

{kea2_python-1.1.0 → kea2_python-1.1.0b1}/Kea2_python.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ Kea2_python.egg-info/entry_points.txt
 Kea2_python.egg-info/requires.txt
 Kea2_python.egg-info/top_level.txt
 kea2/__init__.py
+kea2/absDriver.py
 kea2/adbUtils.py
 kea2/cli.py
 kea2/fastbotManager.py

{kea2_python-1.1.0 → kea2_python-1.1.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 1.1.0
+Version: 1.1.0b1
 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
@@ -290,7 +290,7 @@ Some notes:
 3. You need to insert the following code template into your existing test cases: Here, you can add your own hook logic in the commented sections, including starting or stopping the appium session, cleaning up instances, etc. This depends on how you want to design the setup and teardown. Apart from that, you only need to configure the `option` parameter and `configs_path` parameter(where your directory `configs` located, btw, `configs`'s location dependon where you executed `kea2 init`), then pass it to the `run_kea2_testing` function.
 
 ```python
-from kea2 import Kea2Tester, Options
+from kea2 import Kea2Tester, Options, U2Driver
 
 if os.environ.get('KEA2_HYBRID_MODE', '').lower() == 'true': 
     '''
@@ -327,10 +327,6 @@ if os.environ.get('KEA2_HYBRID_MODE', '').lower() == 'true':
 Kea2 automatically generates a HTML test report after each testing session. You can find the report in `output/` under your working directory.
 
 You can also manually generate the test report by `kea2 report` (see `kea2 report -h` for details).
-Use `-s/--sync` to sync data from device before generating the report, and `-p/--path` to point to one or more result directories.
-For example:
-`kea2 report -p output/res_YYYYMMDDHH_xxxxxx`
-`kea2 report -s -p output/res_YYYYMMDDHH_xxxxxx`
 
 You can also merge the test report from multiple testing sessions by `kea2 merge` (see `kea2 merge -h` for details).
 The merged test report is quite useful if you would test your apps for multiple sessions.

{kea2_python-1.1.0 → kea2_python-1.1.0b1}/README.md

@@ -275,7 +275,7 @@ Some notes:
 3. You need to insert the following code template into your existing test cases: Here, you can add your own hook logic in the commented sections, including starting or stopping the appium session, cleaning up instances, etc. This depends on how you want to design the setup and teardown. Apart from that, you only need to configure the `option` parameter and `configs_path` parameter(where your directory `configs` located, btw, `configs`'s location dependon where you executed `kea2 init`), then pass it to the `run_kea2_testing` function.
 
 ```python
-from kea2 import Kea2Tester, Options
+from kea2 import Kea2Tester, Options, U2Driver
 
 if os.environ.get('KEA2_HYBRID_MODE', '').lower() == 'true': 
     '''
@@ -312,10 +312,6 @@ if os.environ.get('KEA2_HYBRID_MODE', '').lower() == 'true':
 Kea2 automatically generates a HTML test report after each testing session. You can find the report in `output/` under your working directory.
 
 You can also manually generate the test report by `kea2 report` (see `kea2 report -h` for details).
-Use `-s/--sync` to sync data from device before generating the report, and `-p/--path` to point to one or more result directories.
-For example:
-`kea2 report -p output/res_YYYYMMDDHH_xxxxxx`
-`kea2 report -s -p output/res_YYYYMMDDHH_xxxxxx`
 
 You can also merge the test report from multiple testing sessions by `kea2 merge` (see `kea2 merge -h` for details).
 The merged test report is quite useful if you would test your apps for multiple sessions.

kea2_python-1.1.0b1/kea2/absDriver.py

@@ -0,0 +1,56 @@
+import abc
+
+
+class AbstractScriptDriver(abc.ABC):
+    _instances = {}
+    def __new__(cls, *args, **kwargs):
+        if cls not in cls._instances:
+            cls._instances[cls] = super().__new__(cls)
+        return cls._instances[cls]
+    
+    @abc.abstractmethod
+    def getInstance(self):
+        pass
+
+
+class AbstractStaticChecker(abc.ABC):
+    _instances = {}
+    def __new__(cls, *args, **kwargs):
+        if cls not in cls._instances:
+            cls._instances[cls] = super().__new__(cls)
+        return cls._instances[cls]
+    
+    @abc.abstractmethod
+    def getInstance(self):
+        pass
+
+    @abc.abstractmethod
+    def setHierarchy(hierarchy):
+        pass
+
+
+class AbstractDriver(abc.ABC):
+    _instances = {}
+    def __new__(cls, *args, **kwargs):
+        if cls not in cls._instances:
+            cls._instances[cls] = super().__new__(cls)
+        return cls._instances[cls]
+    
+    @classmethod
+    @abc.abstractmethod
+    def setDevice(self):
+        pass
+    
+    @classmethod
+    @abc.abstractmethod
+    def getScriptDriver(self) -> AbstractScriptDriver:
+        pass
+    
+    @classmethod
+    @abc.abstractmethod
+    def getStaticChecker(self, hierarchy) -> AbstractStaticChecker:
+        pass
+
+    @classmethod
+    @abc.abstractmethod
+    def tearDown(self): ...

{kea2_python-1.1.0 → kea2_python-1.1.0b1}/kea2/assets/quicktest.py

@@ -2,43 +2,39 @@ import unittest
 import uiautomator2 as u2
 
 from time import sleep
-from kea2 import precondition, prob, KeaTestRunner, Options, keaTestLoader, invariant
+from kea2 import precondition, prob, KeaTestRunner, Options, kea, keaTestLoader
+from kea2.u2Driver import U2Driver
 
 
 class Omni_Notes_Sample(unittest.TestCase):
-    d: u2.Device
 
-    @classmethod
-    def setUpClass(cls):
-        """Here you can setup the initialize setting for uiautomator2
-        """ 
-        print("Setting driver settings")
-        cls.d.settings["wait_timeout"] = 5.0
-        cls.d.settings["operation_delay"] = (0, 1.0)
-
-    @prob(0.5)
+    def setUp(self):
+        self.d = u2.connect() 
+    
+    @prob(0.2)
     @precondition(
         lambda self: self.d(description="Navigate up").exists
     )
-    def navigate_up(self):
+    def test_goBack(self):
         print("Navigate back")
         self.d(description="Navigate up").click()
-
-    @prob(0.5)
+        sleep(0.5)
+    
+    @prob(0.2)
     @precondition(
-        lambda self: self.d(description="drawer closed").exists and 
-        not self.d(text="Omni Notes Alpha").exists
+        lambda self: self.d(description="drawer closed").exists
     )
-    def open_drawer(self):
+    def test_openDrawer(self):
         print("Open drawer")
         self.d(description="drawer closed").click()
+        sleep(0.5)
 
-    @prob(0.7)  # The probability of executing the function when precondition is satisfied.
+    @prob(0.5)  # The probability of executing the function when precondition is satisfied.
     @precondition(
         lambda self: self.d(text="Omni Notes Alpha").exists
         and self.d(text="Settings").exists
     )
-    def go_to_privacy_settings(self):
+    def test_goToPrivacy(self):
         """
         The ability to jump out of the UI tarpits
 
@@ -49,13 +45,14 @@ class Omni_Notes_Sample(unittest.TestCase):
         """
         print("trying to click Settings")
         self.d(text="Settings").click()
+        sleep(0.5)
         print("trying to click Privacy")
         self.d(text="Privacy").click()
 
     @precondition(
         lambda self: self.d(resourceId="it.feio.android.omninotes.alpha:id/search_src_text").exists
     )
-    def rotation_should_not_close_the_search_input(self):
+    def test_rotation(self):
         """
         The ability to make assertion to find functional bug
 
@@ -68,28 +65,11 @@ class Omni_Notes_Sample(unittest.TestCase):
         """
         print("rotate the device")
         self.d.set_orientation("l")
+        sleep(2)
         self.d.set_orientation("n")
-        assert self.d(resourceId="it.feio.android.omninotes.alpha:id/search_src_text").exists
+        sleep(2)
+        assert self.d(resourceId="it.feio.android.omninotes.alpha:id/search_src_text").exists()
 
-    @invariant
-    def search_button_and_search_input_box_should_not_exists_at_the_same_time(self):
-        """Search input box and search button should not exists at the same time
-        """
-        search_input_box_exists = self.d(resourceId="it.feio.android.omninotes.alpha:id/search_src_text").exists
-        serach_button_exists = self.d(resourceId="it.feio.android.omninotes.alpha:id/menu_search").exists
-        if search_input_box_exists or serach_button_exists:
-            assert search_input_box_exists ^ serach_button_exists
-
-    @precondition(lambda self: "camera" in self.d.app_current().get("package", ""))
-    def exit_camera(self):
-        """Exit camera app if it is launched 
-        (fastbot can't exit camera app by itself, we use kea2 to exit it to aviod getting stuck in camera)
-        """
-        print("Exiting camera app")
-        pkg_camera = self.d.app_current().get("package", "")
-        print(f"Current package: {pkg_camera}")
-        if "camera" in pkg_camera:
-            self.d.app_stop(pkg_camera)
 
 URL = "https://github.com/federicoiosue/Omni-Notes/releases/download/6.2.0_alpha/OmniNotes-alphaRelease-6.2.0.apk"
 FALL_BACK_URL = "https://gitee.com/XixianLiang/Kea2/raw/main/omninotes.apk"
@@ -132,6 +112,7 @@ if __name__ == "__main__":
     KeaTestRunner.setOptions(
         Options(
             driverName="d",
+            Driver=U2Driver,
             packageNames=[PACKAGE_NAME],
             # serial="emulator-5554",   # specify the serial
             maxStep=50,

{kea2_python-1.1.0 → kea2_python-1.1.0b1}/kea2/cli.py

@@ -58,8 +58,6 @@ def cmd_report(args):
     from .report.bug_report_generator import BugReportGenerator
     report_dirs = args.path
     
-    sync_data = args.sync
-     
     for report_dir in report_dirs:
         report_dir = Path(report_dir).resolve()
 
@@ -68,7 +66,7 @@ def cmd_report(args):
             continue
         
         logger.debug(f"Generating test report from directory: {report_dir}")
-        BugReportGenerator(report_dir, sync_data).generate_report()
+        BugReportGenerator(report_dir).generate_report()
 
 
 def cmd_merge(args):
@@ -138,12 +136,6 @@ _commands = [
                 nargs="+",
                 required=True,
                 help="Root directory path of the test results to generate report from"
-            ),
-            dict(
-                name=["sync_data"],
-                args=["-s", "--sync"],
-                action="store_true",
-                help="Sync data from device before generating report"
             )
         ]
     ),

{kea2_python-1.1.0 → kea2_python-1.1.0b1}/kea2/fastbotManager.py

@@ -237,7 +237,7 @@ class FastbotManager:
 
         outfile = open(self.log_file, "w", encoding="utf-8", buffering=1)
 
-        logger.info("Options info: {}".format(self.options.to_dict()))
+        logger.info("Options info: {}".format(asdict(self.options)))
         logger.info("Launching fastbot with shell command:\n{}".format(" ".join(full_cmd)))
         logger.info("Fastbot log will be saved to {}".format(outfile.name))
 
@@ -265,3 +265,5 @@ class FastbotManager:
         self.thread.join()
 
 
+
+

{kea2_python-1.1.0 → kea2_python-1.1.0b1}/kea2/kea2_api.py

@@ -106,15 +106,11 @@ class Kea2Tester:
         
         output_dir = self.options.output_dir
         
-        from .utils import StampManager
+        from .keaUtils import STAMP, LOGFILE, RESFILE
         
         bug_report_path = output_dir / "bug_report.html"
-        stamp_manager = StampManager()
-        stamp = stamp_manager.stamp or self.options.log_stamp
-        result_name = stamp_manager.result_file.name if stamp_manager.result_file else f"result_{stamp}.json"
-        log_name = stamp_manager.log_file.name if stamp_manager.log_file else f"fastbot_{stamp}.log"
-        result_json_path = output_dir / result_name
-        log_file_path = output_dir / log_name
+        result_json_path = output_dir / RESFILE.name if hasattr(RESFILE, 'name') else output_dir / f"result_{STAMP}.json"
+        log_file_path = output_dir / LOGFILE.name if hasattr(LOGFILE, 'name') else output_dir / f"fastbot_{STAMP}.log"
         
         return {
             'executed': True,