Kea2-python 1.0.6b0__tar.gz → 1.1.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 1.0.6b0
+Version: 1.1.0
 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, U2Driver
+from kea2 import Kea2Tester, Options
 
 if os.environ.get('KEA2_HYBRID_MODE', '').lower() == 'true': 
     '''
@@ -327,6 +327,10 @@ 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.0.6b0 → kea2_python-1.1.0}/Kea2_python.egg-info/SOURCES.txt

@@ -8,18 +8,18 @@ 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/fbm_parser.py
-kea2/fs_lock.py
 kea2/kea2_api.py
 kea2/keaUtils.py
 kea2/kea_launcher.py
 kea2/logWatcher.py
 kea2/mixin.py
+kea2/result.py
 kea2/resultSyncer.py
+kea2/state.py
+kea2/typedefs.py
 kea2/u2Driver.py
 kea2/utils.py
 kea2/version_manager.py
@@ -42,10 +42,6 @@ kea2/assets/fastbot_libs/arm64-v8a/libfastbot_native.so
 kea2/assets/fastbot_libs/armeabi-v7a/libfastbot_native.so
 kea2/assets/fastbot_libs/x86/libfastbot_native.so
 kea2/assets/fastbot_libs/x86_64/libfastbot_native.so
-kea2/fastbotx/ActivityTimes.py
-kea2/fastbotx/ReuseEntry.py
-kea2/fastbotx/ReuseModel.py
-kea2/fastbotx/__init__.py
 kea2/report/__init__.py
 kea2/report/bug_report_generator.py
 kea2/report/mixin.py

{kea2_python-1.0.6b0 → kea2_python-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 1.0.6b0
+Version: 1.1.0
 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, U2Driver
+from kea2 import Kea2Tester, Options
 
 if os.environ.get('KEA2_HYBRID_MODE', '').lower() == 'true': 
     '''
@@ -327,6 +327,10 @@ 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.0.6b0 → kea2_python-1.1.0}/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, U2Driver
+from kea2 import Kea2Tester, Options
 
 if os.environ.get('KEA2_HYBRID_MODE', '').lower() == 'true': 
     '''
@@ -312,6 +312,10 @@ 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/__init__.py

@@ -0,0 +1,8 @@
+from .keaUtils import KeaTestRunner, HybridTestRunner, keaTestLoader
+from .keaUtils import Options
+from .keaUtils import precondition, prob, max_tries, interruptable
+from .keaUtils import kea2_breakpoint
+from .state import state, invariant
+from .kea2_api import Kea2Tester
+from .u2Driver import U2Driver
+from .state import state

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

@@ -2,39 +2,43 @@ import unittest
 import uiautomator2 as u2
 
 from time import sleep
-from kea2 import precondition, prob, KeaTestRunner, Options
-from kea2.u2Driver import U2Driver
+from kea2 import precondition, prob, KeaTestRunner, Options, keaTestLoader, invariant
 
 
 class Omni_Notes_Sample(unittest.TestCase):
+    d: u2.Device
 
-    def setUp(self):
-        self.d = u2.connect() 
-    
-    @prob(0.2)
+    @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)
     @precondition(
         lambda self: self.d(description="Navigate up").exists
     )
-    def test_goBack(self):
+    def navigate_up(self):
         print("Navigate back")
         self.d(description="Navigate up").click()
-        sleep(0.5)
-    
-    @prob(0.2)
+
+    @prob(0.5)
     @precondition(
-        lambda self: self.d(description="drawer closed").exists
+        lambda self: self.d(description="drawer closed").exists and 
+        not self.d(text="Omni Notes Alpha").exists
     )
-    def test_openDrawer(self):
+    def open_drawer(self):
         print("Open drawer")
         self.d(description="drawer closed").click()
-        sleep(0.5)
 
-    @prob(0.5)  # The probability of executing the function when precondition is satisfied.
+    @prob(0.7)  # 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 test_goToPrivacy(self):
+    def go_to_privacy_settings(self):
         """
         The ability to jump out of the UI tarpits
 
@@ -45,14 +49,13 @@ 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 test_rotation(self):
+    def rotation_should_not_close_the_search_input(self):
         """
         The ability to make assertion to find functional bug
 
@@ -65,11 +68,28 @@ class Omni_Notes_Sample(unittest.TestCase):
         """
         print("rotate the device")
         self.d.set_orientation("l")
-        sleep(2)
         self.d.set_orientation("n")
-        sleep(2)
-        assert self.d(resourceId="it.feio.android.omninotes.alpha:id/search_src_text").exists()
+        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"
@@ -112,7 +132,6 @@ if __name__ == "__main__":
     KeaTestRunner.setOptions(
         Options(
             driverName="d",
-            Driver=U2Driver,
             packageNames=[PACKAGE_NAME],
             # serial="emulator-5554",   # specify the serial
             maxStep=50,
@@ -123,4 +142,4 @@ if __name__ == "__main__":
             agent="u2"  # 'native' for running the vanilla Fastbot, 'u2' for running Kea2
         )
     )
-    unittest.main(testRunner=KeaTestRunner)
+    unittest.main(testRunner=KeaTestRunner, testLoader=keaTestLoader)

{kea2_python-1.0.6b0 → kea2_python-1.1.0}/kea2/cli.py

@@ -58,6 +58,8 @@ 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()
 
@@ -66,7 +68,7 @@ def cmd_report(args):
             continue
         
         logger.debug(f"Generating test report from directory: {report_dir}")
-        BugReportGenerator(report_dir).generate_report()
+        BugReportGenerator(report_dir, sync_data).generate_report()
 
 
 def cmd_merge(args):
@@ -103,90 +105,7 @@ def cmd_merge(args):
             print(f"📈 Merged {merge_summary.get('merged_directories', 0)} directories", flush=True)
 
     except Exception as e:
-        logger.error(f"Error during merge operation: {e}")
-
-
-def cmd_mergefbm(args):
-    """Merge all FBM files in the specified folder and its subfolders using sum mode"""
-    from .fbm_parser import FBMMerger
-    import glob
-    import shutil
-    
-    try:
-        # Validate input path
-        input_path = Path(args.path).resolve()
-        if not input_path.exists():
-            logger.error(f"Input directory does not exist: {input_path}")
-            return
-        if not input_path.is_dir():
-            logger.error(f"Input path is not a directory: {input_path}")
-            return
-
-        # Find all FBM files in the directory and its subdirectories
-        fbm_files = glob.glob(str(input_path / "**" / "*.fbm"), recursive=True)
-        
-        if not fbm_files:
-            logger.error(f"No FBM files found in {input_path} or its subdirectories")
-            return
-        
-        logger.debug(f"Found {len(fbm_files)} FBM files to merge:")
-        for fbm_file in fbm_files:
-            logger.debug(f"  - {fbm_file}")
-        
-        # Set default output file if not provided
-        if not args.output:
-            output_file = input_path / "merged.fbm"
-        else:
-            output_file = Path(args.output).resolve()
-        
-        # Initialize merger
-        merger = FBMMerger()
-        
-        # Handle different cases
-        if len(fbm_files) == 1:
-            # Only one file, just copy it to output
-            shutil.copyfile(fbm_files[0], output_file)
-            logger.info(f"Only one FBM file found, copied to {output_file}")
-        else:
-            # Merge files iteratively: start with the first file and merge with each subsequent file
-            # Create a temporary file for the intermediate merged result
-            temp_output = input_path / f".tmp_merged.fbm"
-            
-            # Start with the first file as the initial merged result
-            shutil.copyfile(fbm_files[0], temp_output)
-            
-            # Iterate through the remaining files and merge them one by one
-            for i in range(1, len(fbm_files)):
-                current_file = fbm_files[i]
-                next_temp = input_path / f".tmp_merged_{i}.fbm"
-                
-                logger.debug(f"Merging {temp_output} and {current_file} into {next_temp}")
-                success = merger.merge(str(temp_output), str(current_file), str(next_temp), merge_mode='sum')
-                
-                if not success:
-                    logger.error(f"Failed to merge {temp_output} and {current_file}")
-                    # Clean up temporary files
-                    for f in [temp_output, next_temp]:
-                        if f.exists() and f.name.startswith(".tmp_"):
-                            f.unlink()
-                    return
-                
-                # Remove the previous temporary file and update to the new one
-                temp_output.unlink()
-                temp_output = next_temp
-            
-            # Move the final merged file to the output location
-            if temp_output != output_file:
-                temp_output.replace(output_file)
-        
-        print(f"✅ All FBM files merged successfully!", flush=True)
-        print(f"📊 Merged FBM file: {output_file}", flush=True)
-        print(f"📈 Merged {len(fbm_files)} FBM files", flush=True)
-        
-    except Exception as e:
-        logger.error(f"Error during FBM merge operation: {e}")
-        import traceback
-        logger.debug(traceback.format_exc())
+        logger.error(f"Error during merge operation: {e}")      
 
 
 def cmd_run(args):
@@ -219,6 +138,12 @@ _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"
             )
         ]
     ),
@@ -243,27 +168,6 @@ _commands = [
                 help="Output directory for merged report (optional)"
             )
         ]
-    ),
-    dict(
-        action=cmd_mergefbm,
-        command="mergefbm",
-        help="merge all FBM files in the specified folder and its subfolders using sum mode",
-        flags=[
-            dict(
-                name=["path"],
-                args=["-p", "--path"],
-                type=str,
-                required=True,
-                help="Path to the folder containing FBM files to merge"
-            ),
-            dict(
-                name=["output"],
-                args=["-o", "--output"],
-                type=str,
-                required=False,
-                help="Output file path for merged FBM file (optional, default: merged.fbm in the input folder)"
-            )
-        ]
     )
 ]
 

{kea2_python-1.0.6b0 → kea2_python-1.1.0}/kea2/fastbotManager.py

@@ -16,7 +16,8 @@ from .adbUtils import ADBDevice, ADBStreamShell_V2
 
 from typing import IO, TYPE_CHECKING, Dict
 if TYPE_CHECKING:
-    from .keaUtils import Options, PropertyExecutionInfo
+    from .keaUtils import Options
+    from .typedefs import PropertyExecutionInfo
 
 
 logger = getLogger(__name__)
@@ -114,6 +115,7 @@ class FastbotManager:
             data={
                 "propName": execution_info.propName,
                 "startStepsCount": execution_info.startStepsCount,
+                "kind": execution_info.kind,
                 "state": execution_info.state,
             }
         )
@@ -235,7 +237,7 @@ class FastbotManager:
 
         outfile = open(self.log_file, "w", encoding="utf-8", buffering=1)
 
-        logger.info("Options info: {}".format(asdict(self.options)))
+        logger.info("Options info: {}".format(self.options.to_dict()))
         logger.info("Launching fastbot with shell command:\n{}".format(" ".join(full_cmd)))
         logger.info("Fastbot log will be saved to {}".format(outfile.name))
 
@@ -263,5 +265,3 @@ class FastbotManager:
         self.thread.join()
 
 
-
-

{kea2_python-1.0.6b0 → kea2_python-1.1.0}/kea2/kea2_api.py

@@ -106,11 +106,15 @@ class Kea2Tester:
         
         output_dir = self.options.output_dir
         
-        from .keaUtils import STAMP, LOGFILE, RESFILE
+        from .utils import StampManager
         
         bug_report_path = output_dir / "bug_report.html"
-        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"
+        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
         
         return {
             'executed': True,