diff --git a/.circleci/config.yml b/.circleci/config.yml index d7ebea9..53e4c9b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,6 +77,15 @@ jobs: - run: command: python ./test/unit_test/timeout/timeout_test.py name: timeout_test + # argparse + - run: + command: python ./test/unit_test/argparse/argparse_test.py + name: argparse_test + # html report test + - run: + command: python ./test/unit_test/html_report/html_report_test.py + name: html_report_test + # GUI Test # image detect - run: @@ -88,10 +97,6 @@ jobs: - run: command: python ./test/gui_test/image/locate_image_center.py name: locate_image_center_test - # argparse - - run: - command: python ./test/unit_test/argparse/argparse_test.py - name: argparse_test # integrated_test - run: @@ -173,6 +178,11 @@ jobs: - run: command: python ./test/unit_test/timeout/timeout_test.py name: timeout_test + # html report test + - run: + command: python ./test/unit_test/html_report/html_report_test.py + name: html_report_test + # GUI Test # image detect - run: @@ -189,6 +199,7 @@ jobs: command: python ./test/unit_test/argparse/argparse_test.py name: argparse_test + # integrated_test - run: command: python ./test/integrated_test/total_record_and_html_report_test/total_record_and_html_report_test.py diff --git a/.idea/workspace.xml b/.idea/workspace.xml index fb692ef..b533250 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,7 @@ - - + + - @@ -75,7 +75,7 @@ - + - + - + - + - + - + @@ -381,7 +381,16 @@ - + + + + + + + + + + @@ -463,8 +472,8 @@ - + @@ -484,6 +493,7 @@ + diff --git a/README.md b/README.md index 3914641..be5f160 100644 --- a/README.md +++ b/README.md @@ -30,10 +30,6 @@ documentation available at [https://python-jeautocontrol.readthedocs.io/en/lates pip install je_auto_control ``` -``` - -``` - ## Info * requirement diff --git a/dev_setup.py b/dev_setup.py index f9eebd7..dec9bed 100644 --- a/dev_setup.py +++ b/dev_setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="je_auto_control_dev", - version="0.0.20", + version="0.0.21", author="JE-Chen", author_email="zenmailman@gmail.com", description="auto testing", diff --git a/je_auto_control/__init__.py b/je_auto_control/__init__.py index 177bd01..1a5397c 100644 --- a/je_auto_control/__init__.py +++ b/je_auto_control/__init__.py @@ -60,7 +60,7 @@ # timeout from je_auto_control.utils.timeout.multiprocess_timeout import multiprocess_timeout # test record -from je_auto_control.utils.test_record.record_test_class import test_record +from je_auto_control.utils.test_record.record_test_class import test_record_instance # utils image from je_auto_control.wrapper.auto_control_image import screenshot diff --git a/je_auto_control/utils/executor/action_executor.py b/je_auto_control/utils/executor/action_executor.py index 775ebe5..b166185 100644 --- a/je_auto_control/utils/executor/action_executor.py +++ b/je_auto_control/utils/executor/action_executor.py @@ -25,7 +25,10 @@ from je_auto_control.utils.exception.exceptions import AutoControlActionException from je_auto_control.utils.json.json_file import read_action_json -from je_auto_control.utils.test_record.record_test_class import record_total +from je_auto_control.utils.test_record.record_test_class import record_action_to_list +from je_auto_control.utils.test_record.record_test_class import test_record_instance + +from je_auto_control.utils.html_report.html_report_generate import generate_html event_dict = { # mouse @@ -54,7 +57,11 @@ "locate_and_click": locate_and_click, # screen "size": size, - "screenshot": screenshot + "screenshot": screenshot, + # test record + "set_record_enable": test_record_instance.set_record_enable, + # generate html + "generate_html": generate_html, } @@ -69,18 +76,22 @@ def execute_action(action_list: list) -> str: if action_list is None: raise AutoControlActionNullException(action_is_null_error) for action in action_list: - event = event_dict.get(action[0]) - if len(action) == 2: - event(**action[1]) - elif len(action) == 1: - event() - else: - raise AutoControlActionException(cant_execute_action_error) + try: + event = event_dict.get(action[0]) + if len(action) == 2: + event(**action[1]) + elif len(action) == 1: + event() + else: + raise AutoControlActionException(cant_execute_action_error) + except Exception as error: + print(repr(error), file=sys.stderr) + record_action_to_list("execute_action", None, repr(error)) temp_string = "execute: " + str(action) print(temp_string) execute_record_string = "".join([execute_record_string, temp_string + "\n"]) except Exception as error: - record_total("execute_action", action_list, repr(error)) + record_action_to_list("execute_action", action_list, repr(error)) print(repr(error), file=sys.stderr) return execute_record_string diff --git a/je_auto_control/utils/html_report/html_report_generate.py b/je_auto_control/utils/html_report/html_report_generate.py index f2cbc04..4641e31 100644 --- a/je_auto_control/utils/html_report/html_report_generate.py +++ b/je_auto_control/utils/html_report/html_report_generate.py @@ -1,6 +1,6 @@ import sys -from je_auto_control.utils.test_record.record_test_class import test_record +from je_auto_control.utils.test_record.record_test_class import test_record_instance from je_auto_control.utils.exception.exceptions import HTMLException from je_auto_control.utils.exception.exception_tag import html_generate_no_data_tag from threading import Lock @@ -134,11 +134,11 @@ def generate_html(html_name: str = "default_name") -> str: :param html_name: save html file name :return: html_string """ - if len(test_record.total_record_list) == 0: + if len(test_record_instance.test_record_list) == 0: raise HTMLException(html_generate_no_data_tag) else: event_str = "" - for record_data in test_record.total_record_list: + for record_data in test_record_instance.test_record_list: # because data on record_data all is str if record_data.get("program_exception") == "None": event_str = make_html_table(event_str, record_data, "event_table_head") diff --git a/je_auto_control/utils/test_record/record_test_class.py b/je_auto_control/utils/test_record/record_test_class.py index f791839..044eefc 100644 --- a/je_auto_control/utils/test_record/record_test_class.py +++ b/je_auto_control/utils/test_record/record_test_class.py @@ -3,22 +3,25 @@ class TestRecord(object): - def __init__(self, init_total_record: bool = False): - self.init_total_record = init_total_record - self.total_record_list = list() + def __init__(self, init_record: bool = False): + self.init_record = init_record + self.test_record_list = list() def clean_record(self) -> None: - self.total_record_list = list() + self.test_record_list = list() + def set_record_enable(self, set_enable: bool = True): + self.init_record = set_enable -test_record = TestRecord() +test_record_instance = TestRecord() -def record_total(function_name: str, local_param, program_exception: str = None) -> None: - if not test_record.init_total_record: + +def record_action_to_list(function_name: str, local_param, program_exception: str = None) -> None: + if not test_record_instance.init_record: pass else: - test_record.total_record_list.append( + test_record_instance.test_record_list.append( { "function_name": function_name, "local_param": local_param, diff --git a/je_auto_control/wrapper/auto_control_image.py b/je_auto_control/wrapper/auto_control_image.py index ab50b1b..572fb5b 100644 --- a/je_auto_control/wrapper/auto_control_image.py +++ b/je_auto_control/wrapper/auto_control_image.py @@ -8,7 +8,7 @@ from je_auto_control.wrapper.auto_control_mouse import click_mouse from je_auto_control.wrapper.auto_control_mouse import set_position from je_auto_control.utils.image.screenshot import pil_screenshot -from je_auto_control.utils.test_record.record_test_class import record_total +from je_auto_control.utils.test_record.record_test_class import record_action_to_list def locate_all_image(image, detect_threshold: [float, int] = 1, @@ -26,12 +26,12 @@ def locate_all_image(image, detect_threshold: [float, int] = 1, except ImageNotFoundException as error: raise ImageNotFoundException(find_image_error_variable + " " + repr(error)) if image_data_array[0] is True: - record_total("locate_all_image", param) + record_action_to_list("locate_all_image", param) return image_data_array[1] else: raise ImageNotFoundException(cant_find_image) except Exception as error: - record_total("locate_all_image", param, repr(error)) + record_action_to_list("locate_all_image", param, repr(error)) print(repr(error), file=sys.stderr) @@ -52,12 +52,12 @@ def locate_image_center(image, detect_threshold: [float, int] = 1, draw_image: b height = image_data_array[1][2] - image_data_array[1][0] width = image_data_array[1][3] - image_data_array[1][1] center = [int(height / 2), int(width / 2)] - record_total("locate_image_center", param) + record_action_to_list("locate_image_center", param) return [image_data_array[1][0] + center[0], image_data_array[1][1] + center[1]] else: raise ImageNotFoundException(cant_find_image) except Exception as error: - record_total("locate_image_center", param, repr(error)) + record_action_to_list("locate_image_center", param, repr(error)) print(repr(error), file=sys.stderr) @@ -86,12 +86,12 @@ def locate_and_click( image_center_y = image_data_array[1][1] + center[1] set_position(int(image_center_x), int(image_center_y)) click_mouse(mouse_keycode) - record_total("locate_and_click", param) + record_action_to_list("locate_and_click", param) return [image_center_x, image_center_y] else: raise ImageNotFoundException(cant_find_image) except Exception as error: - record_total("locate_and_click", param, repr(error)) + record_action_to_list("locate_and_click", param, repr(error)) print(repr(error), file=sys.stderr) @@ -103,8 +103,8 @@ def screenshot(file_path: str = None, region: list = None) -> List[Union[int, in """ param = locals() try: - record_total("screenshot", param) + record_action_to_list("screenshot", param) return pil_screenshot(file_path, region) except Exception as error: print(repr(error), file=sys.stderr) - record_total("screenshot", param, repr(error)) + record_action_to_list("screenshot", param, repr(error)) diff --git a/je_auto_control/wrapper/auto_control_keyboard.py b/je_auto_control/wrapper/auto_control_keyboard.py index 84e7858..77d5e22 100644 --- a/je_auto_control/wrapper/auto_control_keyboard.py +++ b/je_auto_control/wrapper/auto_control_keyboard.py @@ -13,7 +13,7 @@ from je_auto_control.wrapper.platform_wrapper import keyboard from je_auto_control.wrapper.platform_wrapper import keyboard_check from je_auto_control.wrapper.platform_wrapper import keys_table -from je_auto_control.utils.test_record.record_test_class import record_total +from je_auto_control.utils.test_record.record_test_class import record_action_to_list def press_key(keycode: [int, str], is_shift: bool = False, skip_record: bool = False) -> str: @@ -38,19 +38,19 @@ def press_key(keycode: [int, str], is_shift: bool = False, skip_record: bool = F elif sys.platform in ["darwin"]: keyboard.press_key(keycode, is_shift=is_shift) if skip_record is False: - record_total("press_key", param) + record_action_to_list("press_key", param) return str(keycode) except AutoControlKeyboardException as error: if skip_record is False: - record_total("press_key", param, repr(error)) + record_action_to_list("press_key", param, repr(error)) raise AutoControlKeyboardException(keyboard_press_key + " " + repr(error)) except TypeError as error: if skip_record is False: - record_total("press_key", param, repr(error)) + record_action_to_list("press_key", param, repr(error)) raise AutoControlKeyboardException(repr(error)) except Exception as error: if skip_record is False: - record_total("press_key", param, repr(error)) + record_action_to_list("press_key", param, repr(error)) else: raise AutoControlKeyboardException(repr(error)) print(repr(error), file=sys.stderr) @@ -76,19 +76,19 @@ def release_key(keycode: [int, str], is_shift: bool = False, skip_record: bool = elif sys.platform in ["darwin"]: keyboard.release_key(keycode, is_shift=is_shift) if skip_record is False: - record_total("release_key", param) + record_action_to_list("release_key", param) return str(keycode) except AutoControlKeyboardException as error: if skip_record is False: - record_total("release_key", param, repr(error)) + record_action_to_list("release_key", param, repr(error)) raise AutoControlKeyboardException(keyboard_release_key + " " + repr(error)) except TypeError as error: if skip_record is False: - record_total("release_key", param, repr(error)) + record_action_to_list("release_key", param, repr(error)) raise AutoControlKeyboardException(repr(error)) except Exception as error: if skip_record is False: - record_total("release_key", param, repr(error)) + record_action_to_list("release_key", param, repr(error)) else: raise AutoControlKeyboardException(repr(error)) print(repr(error), file=sys.stderr) @@ -107,19 +107,19 @@ def type_key(keycode: [int, str], is_shift: bool = False, skip_record: bool = Fa press_key(keycode, is_shift, skip_record=True) release_key(keycode, is_shift, skip_record=True) if skip_record is False: - record_total("type_key", param) + record_action_to_list("type_key", param) return str(keycode) except AutoControlKeyboardException as error: if skip_record is False: - record_total("type_key", param, repr(error)) + record_action_to_list("type_key", param, repr(error)) raise AutoControlKeyboardException(keyboard_type_key + " " + repr(error)) except TypeError as error: if skip_record is False: - record_total("type_key", param, repr(error)) + record_action_to_list("type_key", param, repr(error)) raise AutoControlKeyboardException(repr(error)) except Exception as error: if skip_record is False: - record_total("type_key", param, repr(error)) + record_action_to_list("type_key", param, repr(error)) print(repr(error), file=sys.stderr) @@ -134,10 +134,10 @@ def check_key_is_press(keycode: [int, str]) -> bool: get_key_code = keycode else: get_key_code = keys_table.get(keycode) - record_total("check_key_is_press", param) + record_action_to_list("check_key_is_press", param) return keyboard_check.check_key_is_press(keycode=get_key_code) except Exception as error: - record_total("check_key_is_press", param, repr(error)) + record_action_to_list("check_key_is_press", param, repr(error)) print(repr(error), file=sys.stderr) @@ -166,12 +166,12 @@ def write(write_string: str, is_shift: bool = False) -> str: except AutoControlKeyboardException as error: print(keyboard_write_cant_find, single_string, sep="\t", file=sys.stderr) raise AutoControlKeyboardException(keyboard_write_cant_find) - record_total("write", param) + record_action_to_list("write", param) return record_write_string except AutoControlKeyboardException as error: raise AutoControlKeyboardException(keyboard_write + " " + repr(error)) except Exception as error: - record_total("write", param, repr(error)) + record_action_to_list("write", param, repr(error)) print(repr(error), file=sys.stderr) @@ -203,10 +203,10 @@ def hotkey(key_code_list: list, is_shift: bool = False) -> Tuple[str, str]: release_key(key, is_shift, skip_record=True) ] ) - record_total("hotkey", param) + record_action_to_list("hotkey", param) return record_hotkey_press_string, record_hotkey_release_string except AutoControlKeyboardException as error: raise AutoControlKeyboardException(keyboard_hotkey + " " + repr(error)) except Exception as error: - record_total("hotkey", param, repr(error)) + record_action_to_list("hotkey", param, repr(error)) print(repr(error), file=sys.stderr) diff --git a/je_auto_control/wrapper/auto_control_mouse.py b/je_auto_control/wrapper/auto_control_mouse.py index 6aeb609..ddf09e3 100644 --- a/je_auto_control/wrapper/auto_control_mouse.py +++ b/je_auto_control/wrapper/auto_control_mouse.py @@ -16,7 +16,7 @@ from je_auto_control.wrapper.platform_wrapper import mouse from je_auto_control.wrapper.platform_wrapper import mouse_table from je_auto_control.wrapper.platform_wrapper import special_table -from je_auto_control.utils.test_record.record_test_class import record_total +from je_auto_control.utils.test_record.record_test_class import record_action_to_list def mouse_preprocess(mouse_keycode: [int, str], x: int, y: int) -> Tuple[Union[int, str], int, int]: @@ -53,12 +53,12 @@ def position() -> Tuple[int, int]: """ try: try: - record_total("position", None) + record_action_to_list("position", None) return mouse.position() except AutoControlMouseException as error: raise AutoControlMouseException(mouse_get_position + " " + repr(error)) except Exception as error: - record_total("position", None, repr(error)) + record_action_to_list("position", None, repr(error)) print(repr(error), file=sys.stderr) @@ -72,14 +72,14 @@ def set_position(x: int, y: int) -> Tuple[int, int]: try: try: mouse.set_position(x=x, y=y) - record_total("position", param) + record_action_to_list("position", param) return x, y except AutoControlMouseException as error: raise AutoControlMouseException(mouse_set_position + " " + repr(error)) except ctypes.ArgumentError as error: raise AutoControlMouseException(mouse_wrong_value + " " + repr(error)) except Exception as error: - record_total("set_position", param, repr(error)) + record_action_to_list("set_position", param, repr(error)) print(repr(error), file=sys.stderr) @@ -99,14 +99,14 @@ def press_mouse(mouse_keycode: [int, str], x: int = None, y: int = None) -> Tupl mouse.press_mouse(mouse_keycode) elif sys.platform in ["darwin"]: mouse.press_mouse(x, y, mouse_keycode) - record_total("press_mouse", param) + record_action_to_list("press_mouse", param) return mouse_keycode, x, y except AutoControlMouseException as error: raise AutoControlMouseException(mouse_press_mouse + " " + repr(error)) except TypeError as error: raise AutoControlMouseException(repr(error)) except Exception as error: - record_total("press_mouse", param, repr(error)) + record_action_to_list("press_mouse", param, repr(error)) print(repr(error), file=sys.stderr) @@ -126,14 +126,14 @@ def release_mouse(mouse_keycode: [int, str], x: int = None, y: int = None) -> Tu mouse.release_mouse(mouse_keycode) elif sys.platform in ["darwin"]: mouse.release_mouse(x, y, mouse_keycode) - record_total("press_mouse", param) + record_action_to_list("press_mouse", param) return mouse_keycode, x, y except AutoControlMouseException as error: raise AutoControlMouseException(mouse_release_mouse + " " + repr(error)) except TypeError as error: raise AutoControlMouseException(repr(error)) except Exception as error: - record_total("release_mouse", param, repr(error)) + record_action_to_list("release_mouse", param, repr(error)) print(repr(error), file=sys.stderr) @@ -150,16 +150,16 @@ def click_mouse(mouse_keycode: [int, str], x: int = None, y: int = None) -> Tupl mouse_keycode, x, y = mouse_preprocess(mouse_keycode, x, y) try: mouse.click_mouse(mouse_keycode, x, y) - record_total("click_mouse", param) + record_action_to_list("click_mouse", param) return mouse_keycode, x, y except AutoControlMouseException as error: - record_total("click_mouse", param, mouse_click_mouse + " " + repr(error)) + record_action_to_list("click_mouse", param, mouse_click_mouse + " " + repr(error)) raise AutoControlMouseException(mouse_click_mouse + " " + repr(error)) except TypeError as error: - record_total("click_mouse", param, repr(error)) + record_action_to_list("click_mouse", param, repr(error)) raise AutoControlMouseException(repr(error)) except Exception as error: - record_total("click_mouse", param, repr(error)) + record_action_to_list("click_mouse", param, repr(error)) print(repr(error), file=sys.stderr) @@ -179,7 +179,7 @@ def scroll(scroll_value: int, x: int = None, y: int = None, scroll_direction: st try: now_cursor_x, now_cursor_y = position() except AutoControlMouseException as error: - record_total("scroll", param, repr(error)) + record_action_to_list("scroll", param, repr(error)) raise AutoControlMouseException(mouse_get_position) width, height = size() if x is None: @@ -210,5 +210,5 @@ def scroll(scroll_value: int, x: int = None, y: int = None, scroll_direction: st except TypeError as error: raise AutoControlMouseException(repr(error)) except Exception as error: - record_total("scroll", param, repr(error)) + record_action_to_list("scroll", param, repr(error)) print(repr(error), file=sys.stderr) diff --git a/je_auto_control/wrapper/auto_control_record.py b/je_auto_control/wrapper/auto_control_record.py index 30b7712..02744fa 100644 --- a/je_auto_control/wrapper/auto_control_record.py +++ b/je_auto_control/wrapper/auto_control_record.py @@ -4,7 +4,7 @@ from je_auto_control.utils.exception.exceptions import AutoControlException from je_auto_control.utils.exception.exceptions import AutoControlJsonActionException from je_auto_control.wrapper.platform_wrapper import recorder -from je_auto_control.utils.test_record.record_test_class import record_total +from je_auto_control.utils.test_record.record_test_class import record_action_to_list def record() -> None: @@ -14,10 +14,10 @@ def record() -> None: try: if sys.platform == "darwin": raise AutoControlException(macos_record_error) - record_total("record", None) + record_action_to_list("record", None) return recorder.record() except Exception as error: - record_total("record", None, repr(error)) + record_action_to_list("record", None, repr(error)) print(repr(error), file=sys.stderr) @@ -38,9 +38,9 @@ def stop_record() -> list: new_list.append([action[0], dict([["keycode", action[1]]])]) else: new_list.append([action[0], dict(zip(["mouse_keycode", "x", "y"], [action[0], action[1], action[2]]))]) - record_total("stop_record", None) + record_action_to_list("stop_record", None) return new_list except Exception as error: - record_total("stop_record", None, repr(error)) + record_action_to_list("stop_record", None, repr(error)) print(repr(error), file=sys.stderr) diff --git a/je_auto_control/wrapper/auto_control_screen.py b/je_auto_control/wrapper/auto_control_screen.py index 3020724..80d7824 100644 --- a/je_auto_control/wrapper/auto_control_screen.py +++ b/je_auto_control/wrapper/auto_control_screen.py @@ -9,7 +9,7 @@ from je_auto_control.utils.exception.exception_tag import screen_screenshot from je_auto_control.utils.exception.exceptions import AutoControlScreenException from je_auto_control.wrapper.platform_wrapper import screen -from je_auto_control.utils.test_record.record_test_class import record_total +from je_auto_control.utils.test_record.record_test_class import record_action_to_list def size() -> Tuple[int, int]: @@ -18,12 +18,12 @@ def size() -> Tuple[int, int]: """ try: try: - record_total("size", None) + record_action_to_list("size", None) return screen.size() except AutoControlScreenException: raise AutoControlScreenException(screen_get_size) except Exception as error: - record_total("size", None, repr(error)) + record_action_to_list("size", None, repr(error)) print(repr(error), file=sys.stderr) @@ -36,10 +36,10 @@ def screenshot(file_path: str = None, region: list = None) -> List[int]: param = locals() try: try: - record_total("screenshot", param) + record_action_to_list("screenshot", param) return cv2.cvtColor(np.array(pil_screenshot(file_path=file_path, region=region)), cv2.COLOR_RGB2BGR) except AutoControlScreenException as error: raise AutoControlScreenException(screen_screenshot + " " + repr(error)) except Exception as error: - record_total("screenshot", None, repr(error)) + record_action_to_list("screenshot", None, repr(error)) print(repr(error), file=sys.stderr) diff --git a/setup.py b/setup.py index 07da2b3..1c25b24 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="je_auto_control", - version="0.0.90", + version="0.0.91", author="JE-Chen", author_email="zenmailman@gmail.com", description="auto testing", diff --git a/test/integrated_test/total_record_and_html_report_test/total_record_and_html_report_test.py b/test/integrated_test/total_record_and_html_report_test/total_record_and_html_report_test.py index bbaf192..b15bb83 100644 --- a/test/integrated_test/total_record_and_html_report_test/total_record_and_html_report_test.py +++ b/test/integrated_test/total_record_and_html_report_test/total_record_and_html_report_test.py @@ -1,13 +1,13 @@ import sys -from je_auto_control import test_record +from je_auto_control import test_record_instance from je_auto_control import press_key from je_auto_control import release_key from je_auto_control import write from je_auto_control import keys_table from je_auto_control import generate_html -test_record.init_total_record = True +test_record_instance.init_record = True print(keys_table.keys()) @@ -34,7 +34,7 @@ except Exception as error: print(repr(error), file=sys.stderr) -print(test_record.total_record_list) +print(test_record_instance.test_record_list) # html name is test.html and this html will recode all test detail # if test_record.init_total_record = True generate_html("test") diff --git a/test/unit_test/execute_action/execute_action_test.py b/test/unit_test/execute_action/execute_action_test.py index 59ad7c1..06c53c1 100644 --- a/test/unit_test/execute_action/execute_action_test.py +++ b/test/unit_test/execute_action/execute_action_test.py @@ -1,10 +1,10 @@ import sys from je_auto_control import execute_action -from je_auto_control import test_record +from je_auto_control import test_record_instance test_list = None -test_record.init_total_record = True +test_record_instance.init_record = True if sys.platform in ["win32", "cygwin", "msys"]: test_list = [ ["type_key", {"keycode": 65}], @@ -35,4 +35,4 @@ ] print("\n\n") execute_action(test_list) -print(test_record.total_record_list) +print(test_record_instance.test_record_list) diff --git a/test/unit_test/html_report/html_report_test.py b/test/unit_test/html_report/html_report_test.py new file mode 100644 index 0000000..df78368 --- /dev/null +++ b/test/unit_test/html_report/html_report_test.py @@ -0,0 +1,43 @@ +import sys + +from je_auto_control import execute_action, generate_html +from je_auto_control import test_record_instance + +test_list = None +test_record_instance.init_record = True +if sys.platform in ["win32", "cygwin", "msys"]: + test_list = [ + ["set_record_enable", {"set_enable": True}], + ["type_key", {"keycode": 65}], + ["mouse_left", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], + ["position"], + ["press_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], + ["release_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], + ["type_key", {"mouse_keycode": "dwadwawda", "dwadwad": 500, "wdawddwawad": 500}], + ["generate_html"], + ] + +elif sys.platform in ["linux", "linux2"]: + test_list = [ + ["set_record_enable", {"set_enable": True}], + ["type_key", {"keycode": 38}], + ["mouse_left", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], + ["position"], + ["press_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], + ["release_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], + ["type_key", {"mouse_keycode": "dwadwawda", "dwadwad": 500, "wdawddwawad": 500}], + ["generate_html"], + ] +elif sys.platform in ["darwin"]: + test_list = [ + ["set_record_enable", {"set_enable": True}], + ["type_key", {"keycode": 0x00}], + ["mouse_left", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], + ["position"], + ["press_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], + ["release_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], + ["type_key", {"mouse_keycode": "dwadwawda", "dwadwad": 500, "wdawddwawad": 500}], + ["generate_html"], + ] +print("\n\n") +execute_action(test_list) diff --git a/test/unit_test/html_report/test.json b/test/unit_test/html_report/test.json new file mode 100644 index 0000000..a8d8b9f --- /dev/null +++ b/test/unit_test/html_report/test.json @@ -0,0 +1 @@ +[["type_key", {"keycode": 0}], ["mouse_left", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], ["position"], ["press_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}], ["release_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}]] \ No newline at end of file diff --git a/test/unit_test/total_record_test/total_record_test.py b/test/unit_test/total_record_test/total_record_test.py index 88bfc40..87bb669 100644 --- a/test/unit_test/total_record_test/total_record_test.py +++ b/test/unit_test/total_record_test/total_record_test.py @@ -1,12 +1,12 @@ import sys -from je_auto_control import test_record +from je_auto_control import test_record_instance from je_auto_control import press_key from je_auto_control import release_key from je_auto_control import write from je_auto_control import keys_table -test_record.init_total_record = True +test_record_instance.init_record = True print(keys_table.keys()) @@ -33,6 +33,6 @@ except Exception as error: print(repr(error), file=sys.stderr) -print(test_record.total_record_list) +print(test_record_instance.test_record_list)