From 1d733cd9d5ca0e06c7b318ace0ef45c8d5d1f481 Mon Sep 17 00:00:00 2001
From: JE-Chen <zenxcvwait@gmail.com>
Date: Fri, 26 Nov 2021 17:09:39 +0800
Subject: [PATCH 1/4] fix & refactor

fix json_reformat bug
refactor test path
---
 .circleci/config.yml                          |  36 ++---
 .idea/workspace.xml                           | 132 +++++++++++-------
 .../circle_ci_test_source/test.png            | Bin
 .../circle_ci_test_source/test1.PNG           | Bin
 .../circle_ci_test_source/test_template.png   | Bin
 .../critical_exit/critical_exit_test.py       |   0
 .../critical_exit/real_critical_test.py       |   0
 .../exception/test_auto_control_exception.py  |   0
 .../test_image_not_found_exception.py         |   0
 .../execute_action/execute_action_test.py     |   0
 .../image/locate_all_image_test.py            |   0
 .../image/locate_and_click_test.py            |   0
 .../image/locate_image_center_test.py         |   0
 .../{ => unit_test}/json/json_test.py         |   0
 .../{ => unit_test}/keyboard/hotkey_test.py   |   0
 .../keyboard/keyboard_is_press_test.py        |   0
 .../keyboard/keyboard_type_test.py            |   0
 .../keyboard/keyboard_write_test.py           |   0
 .../mouse/mouse_scroll_test.py                |   0
 .../{ => unit_test}/mouse/mouse_test.py       |   0
 .../{ => unit_test}/record/record_test.py     |   0
 .../{ => unit_test}/screen/screen_test.py     |   0
 .../{ => unit_test}/screen/screenshot_test.py |   0
 .../{ => unit_test}/timeout/timeout_test.py   |   0
 .../exception/test_auto_control_exception.py  |   0
 .../test_image_not_found_exception.py         |   0
 .../test/critical_exit/critical_exit_test.py  |   0
 .../test/critical_exit/real_critical_test.py  |   0
 .../execute_action/execute_action_test.py     |   0
 .../test/image/locate_all_image.py            |   0
 .../test/image/locate_and_click.py            |   0
 .../test/image/locate_image_center.py         |   0
 .../test/json/json_test.py                    |   2 +-
 .../test/keyboard/hotkey_test.py              |   0
 .../test/keyboard/keyboard_is_press_test.py   |   0
 .../test/keyboard/keyboard_type_test.py       |   0
 .../test/keyboard/keyboard_write_test.py      |   0
 .../test/mouse/mouse_scroll_test.py           |   0
 .../test/mouse/mouse_test.py                  |   0
 .../test/record/record_test.py                |   0
 .../test/screen/screen_test.py                |   0
 .../test/screen/screenshot_test.py            |   0
 .../test/timeout/timeout_test.py              |   0
 .../with_editor/auto_gui_with_je_editor.py    |   0
 test/{ => unit_test}/test_source/test.png     | Bin
 test/{ => unit_test}/test_source/test1.PNG    | Bin
 .../test_source/test_template.png             | Bin
 47 files changed, 104 insertions(+), 66 deletions(-)
 rename circle_ci_test/{ => unit_test}/circle_ci_test_source/test.png (100%)
 rename circle_ci_test/{ => unit_test}/circle_ci_test_source/test1.PNG (100%)
 rename circle_ci_test/{ => unit_test}/circle_ci_test_source/test_template.png (100%)
 rename circle_ci_test/{ => unit_test}/critical_exit/critical_exit_test.py (100%)
 rename circle_ci_test/{ => unit_test}/critical_exit/real_critical_test.py (100%)
 rename circle_ci_test/{ => unit_test}/exception/test_auto_control_exception.py (100%)
 rename circle_ci_test/{ => unit_test}/exception/test_image_not_found_exception.py (100%)
 rename circle_ci_test/{ => unit_test}/execute_action/execute_action_test.py (100%)
 rename circle_ci_test/{ => unit_test}/image/locate_all_image_test.py (100%)
 rename circle_ci_test/{ => unit_test}/image/locate_and_click_test.py (100%)
 rename circle_ci_test/{ => unit_test}/image/locate_image_center_test.py (100%)
 rename circle_ci_test/{ => unit_test}/json/json_test.py (100%)
 rename circle_ci_test/{ => unit_test}/keyboard/hotkey_test.py (100%)
 rename circle_ci_test/{ => unit_test}/keyboard/keyboard_is_press_test.py (100%)
 rename circle_ci_test/{ => unit_test}/keyboard/keyboard_type_test.py (100%)
 rename circle_ci_test/{ => unit_test}/keyboard/keyboard_write_test.py (100%)
 rename circle_ci_test/{ => unit_test}/mouse/mouse_scroll_test.py (100%)
 rename circle_ci_test/{ => unit_test}/mouse/mouse_test.py (100%)
 rename circle_ci_test/{ => unit_test}/record/record_test.py (100%)
 rename circle_ci_test/{ => unit_test}/screen/screen_test.py (100%)
 rename circle_ci_test/{ => unit_test}/screen/screenshot_test.py (100%)
 rename circle_ci_test/{ => unit_test}/timeout/timeout_test.py (100%)
 rename test/{ => unit_test}/platform_independent/exception/test_auto_control_exception.py (100%)
 rename test/{ => unit_test}/platform_independent/exception/test_image_not_found_exception.py (100%)
 rename test/{ => unit_test}/platform_independent/test/critical_exit/critical_exit_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/critical_exit/real_critical_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/execute_action/execute_action_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/image/locate_all_image.py (100%)
 rename test/{ => unit_test}/platform_independent/test/image/locate_and_click.py (100%)
 rename test/{ => unit_test}/platform_independent/test/image/locate_image_center.py (100%)
 rename test/{ => unit_test}/platform_independent/test/json/json_test.py (88%)
 rename test/{ => unit_test}/platform_independent/test/keyboard/hotkey_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/keyboard/keyboard_is_press_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/keyboard/keyboard_type_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/keyboard/keyboard_write_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/mouse/mouse_scroll_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/mouse/mouse_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/record/record_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/screen/screen_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/screen/screenshot_test.py (100%)
 rename test/{ => unit_test}/platform_independent/test/timeout/timeout_test.py (100%)
 rename test/{ => unit_test}/platform_independent/with_editor/auto_gui_with_je_editor.py (100%)
 rename test/{ => unit_test}/test_source/test.png (100%)
 rename test/{ => unit_test}/test_source/test1.PNG (100%)
 rename test/{ => unit_test}/test_source/test_template.png (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4a0bce4..ed05ed4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,67 +17,67 @@ jobs:
           name: pip requirements.txt
       # screen test
       - run:
-          command: python ./circle_ci_test/screen/screen_test.py
+          command: python ./circle_ci_test/unit_test/screen/screen_test.py
           name: screen_test
       - run:
-          command: python ./circle_ci_test/screen/screenshot_test.py
+          command: python ./circle_ci_test/unit_test/screen/screenshot_test.py
           name: screenshot_test
       # keyboard test
       - run:
-          command: python ./circle_ci_test/keyboard/keyboard_type_test.py
+          command: python ./circle_ci_test/unit_test/keyboard/keyboard_type_test.py
           name: keyboard_type_test
       - run:
-          command: python ./circle_ci_test/keyboard/keyboard_write_test.py
+          command: python ./circle_ci_test/unit_test/keyboard/keyboard_write_test.py
           name: keyboard_write_test
       - run:
-          command: python ./circle_ci_test/keyboard/keyboard_is_press_test.py
+          command: python ./circle_ci_test/unit_test/keyboard/keyboard_is_press_test.py
           name: keyboard_is_press_test
       - run:
-          command: python ./circle_ci_test/keyboard/hotkey_test.py
+          command: python ./circle_ci_test/unit_test/keyboard/hotkey_test.py
           name: hotkey_test
       # mouse test
       - run:
-          command: python ./circle_ci_test/mouse/mouse_test.py
+          command: python ./circle_ci_test/unit_test/mouse/mouse_test.py
           name: mouse_test
       - run:
-          command: python ./circle_ci_test/mouse/mouse_scroll_test.py
+          command: python ./circle_ci_test/unit_test/mouse/mouse_scroll_test.py
           name: scroll_test
       # exception test
       - run:
-          command: python ./circle_ci_test/exception/test_auto_control_exception.py
+          command: python ./circle_ci_test/unit_test/exception/test_auto_control_exception.py
           name: test_auto_control_exception
       # image detect
       - run:
-          command: python ./circle_ci_test/image/locate_all_image_test.py
+          command: python ./circle_ci_test/unit_test/image/locate_all_image_test.py
           name: locate_all_image_test
       - run:
-          command: python ./circle_ci_test/image/locate_and_click_test.py
+          command: python ./circle_ci_test/unit_test/image/locate_and_click_test.py
           name: locate_and_click_test
       - run:
-          command: python ./circle_ci_test/image/locate_image_center_test.py
+          command: python ./circle_ci_test/unit_test/image/locate_image_center_test.py
           name: locate_image_center_test
       # critical exit
       - run:
-          command: python ./circle_ci_test/critical_exit/critical_exit_test.py
+          command: python ./circle_ci_test/unit_test/critical_exit/critical_exit_test.py
           name: critical_exit_test
       - run:
-          command: python ./circle_ci_test/critical_exit/real_critical_test.py
+          command: python ./circle_ci_test/unit_test/critical_exit/real_critical_test.py
           name: real_critical_test
       # record
       - run:
-          command: python ./circle_ci_test/record/record_test.py
+          command: python ./circle_ci_test/unit_test/record/record_test.py
           name: record_test
       # execute
       - run:
-          command: python ./circle_ci_test/execute_action/execute_action_test.py
+          command: python ./circle_ci_test/unit_test/execute_action/execute_action_test.py
           name: execute_action_test
       # json
       - run:
-          command: python ./circle_ci_test/json/json_test.py
+          command: python ./circle_ci_test/unit_test/json/json_test.py
           name: json_test
       # timeout
       - run:
-          command: python ./circle_ci_test/timeout/timeout_test.py
+          command: python ./circle_ci_test/unit_test/timeout/timeout_test.py
           name: timeout_test
 
 workflows:
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b669725..0a1bc2a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,16 +4,51 @@
     <list default="true" id="99292fb8-fc1c-4a2d-a504-0b1ea6c77fb2" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.circleci/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.circleci/config.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_keyboard.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_keyboard.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_mouse.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_mouse.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_record.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_record.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/hotkey_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/platform_independent/test/keyboard/hotkey_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_is_press_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_is_press_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_type_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_type_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_write_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_write_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/screen/screen_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/platform_independent/test/screen/screen_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/screen/screenshot_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/platform_independent/test/screen/screenshot_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/circle_ci_test_source/test.png" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/circle_ci_test_source/test.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/circle_ci_test_source/test1.PNG" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/circle_ci_test_source/test1.PNG" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/circle_ci_test_source/test_template.png" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/circle_ci_test_source/test_template.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/critical_exit/critical_exit_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/critical_exit/critical_exit_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/critical_exit/real_critical_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/critical_exit/real_critical_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/exception/test_auto_control_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/exception/test_auto_control_exception.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/exception/test_image_not_found_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/exception/test_image_not_found_exception.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/execute_action/execute_action_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/execute_action/execute_action_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/image/locate_all_image_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/image/locate_all_image_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/image/locate_and_click_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/image/locate_and_click_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/image/locate_image_center_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/image/locate_image_center_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/json/json_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/json/json_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/keyboard/hotkey_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/keyboard/hotkey_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/keyboard/keyboard_is_press_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/keyboard/keyboard_is_press_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/keyboard/keyboard_type_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/keyboard/keyboard_type_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/keyboard/keyboard_write_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/keyboard/keyboard_write_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/mouse/mouse_scroll_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/mouse/mouse_scroll_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/mouse/mouse_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/mouse/mouse_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/record/record_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/record/record_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/screen/screen_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/screen/screen_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/screen/screenshot_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/screen/screenshot_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/circle_ci_test/timeout/timeout_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/timeout/timeout_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/exception/test_auto_control_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/test_auto_control_exception.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/exception/test_image_not_found_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/test_image_not_found_exception.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/critical_exit/critical_exit_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit/critical_exit_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/critical_exit/real_critical_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit/real_critical_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/execute_action/execute_action_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action/execute_action_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/image/locate_all_image.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/image/locate_all_image.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/image/locate_and_click.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/image/locate_and_click.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/image/locate_image_center.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/image/locate_image_center.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/json/json_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/json/json_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/hotkey_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/keyboard/hotkey_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_is_press_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/keyboard/keyboard_is_press_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_type_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/keyboard/keyboard_type_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_write_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/keyboard/keyboard_write_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/mouse/mouse_scroll_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/mouse/mouse_scroll_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/mouse/mouse_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/mouse/mouse_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/record/record_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/record/record_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/screen/screen_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/screen/screen_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/screen/screenshot_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/screen/screenshot_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/timeout/timeout_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/timeout/timeout_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/platform_independent/with_editor/auto_gui_with_je_editor.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/with_editor/auto_gui_with_je_editor.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/test_source/test.png" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/test_source/test.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/test_source/test1.PNG" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/test_source/test1.PNG" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/test_source/test_template.png" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/test_source/test_template.png" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -41,12 +76,12 @@
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$PROJECT_DIR$/je_auto_control/utils/je_auto_control_exception/exceptions.py" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/je_auto_control/utils/je_auto_control_exception/exception_tag.py" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/test/platform_independent/test/critical_exit/critical_exit_test.py" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/circle_ci_test/keyboard/keyboard_write_test.py" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/test/platform_independent/with_editor/auto_gui_with_je_editor.py" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit/critical_exit_test.py" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/circle_ci_test/unit_test/keyboard/keyboard_write_test.py" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/test/unit_test/platform_independent/with_editor/auto_gui_with_je_editor.py" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/setup.py" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/je_auto_control/linux_with_x11/listener/x11_linux_listener.py" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/test/platform_independent/test/mouse/mouse_test.py" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/test/unit_test/platform_independent/test/mouse/mouse_test.py" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/je_auto_control/osx/mouse/osx_mouse.py" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/je_auto_control/wrapper/auto_control_keyboard.py" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/je_auto_control/utils/action_executer/action_executor.py" root0="FORCE_HIGHLIGHTING" />
@@ -64,7 +99,7 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/circle_ci_test" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../Python_JE_API_Test" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="RecentsManager">
@@ -75,15 +110,15 @@
       <recent name="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\circle_ci_test\circle_ci_test_source" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\WorkSpaces\Program WorkSpace\Python\Project\AutoControl\circle_ci_test\unit_test" />
+      <recent name="D:\WorkSpaces\Program WorkSpace\Python\Project\AutoControl\test\unit_test" />
       <recent name="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\je_auto_control\windows\core\utils" />
       <recent name="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\test\platform_independent\test\json" />
       <recent name="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\test\platform_independent\test\record" />
-      <recent name="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\test\platform_independent\test\critical_exit" />
-      <recent name="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\test\platform_independent\test\screen" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.hotkey_test">
-    <configuration name="hotkey_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="Python.json_test">
+    <configuration name="action_executor" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -91,12 +126,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/je_auto_control/utils/action_executer" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/keyboard/hotkey_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/je_auto_control/utils/action_executer/action_executor.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -105,7 +140,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="keyboard_type_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="hotkey_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -118,7 +153,7 @@
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_type_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/keyboard/hotkey_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -127,7 +162,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="keyboard_write_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="json_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -135,12 +170,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/json" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_write_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/json/json_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -149,20 +184,20 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="multiprocess_timeout" type="PythonConfigurationType" factoryName="Python">
+    <configuration name="keyboard_type_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\venv\Scripts\python.exe" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/je_auto_control/utils/timeout" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/je_auto_control/utils/timeout/multiprocess_timeout.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_type_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -171,7 +206,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="screen_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="keyboard_write_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -179,12 +214,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/test/screen" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/screen/screen_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_write_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -193,7 +228,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="test_auto_control_exception" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+    <configuration name="multiprocess_timeout" type="PythonConfigurationType" factoryName="Python">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -201,12 +236,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\venv\Scripts\python.exe" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/exception" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/je_auto_control/utils/timeout" />
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/exception/test_auto_control_exception.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/je_auto_control/utils/timeout/multiprocess_timeout.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -215,20 +250,20 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="timeout_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="test_auto_control_exception" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/test/timeout" />
-      <option name="IS_MODULE_SDK" value="true" />
+      <option name="SDK_HOME" value="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\venv\Scripts\python.exe" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/exception" />
+      <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/timeout/timeout_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/exception/test_auto_control_exception.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -240,19 +275,19 @@
     <list>
       <item itemvalue="Python.multiprocess_timeout" />
       <item itemvalue="Python.test_auto_control_exception" />
-      <item itemvalue="Python.timeout_test" />
-      <item itemvalue="Python.screen_test" />
+      <item itemvalue="Python.hotkey_test" />
       <item itemvalue="Python.keyboard_type_test" />
       <item itemvalue="Python.keyboard_write_test" />
-      <item itemvalue="Python.hotkey_test" />
+      <item itemvalue="Python.action_executor" />
+      <item itemvalue="Python.json_test" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.json_test" />
+        <item itemvalue="Python.action_executor" />
         <item itemvalue="Python.hotkey_test" />
         <item itemvalue="Python.keyboard_write_test" />
         <item itemvalue="Python.keyboard_type_test" />
-        <item itemvalue="Python.screen_test" />
-        <item itemvalue="Python.timeout_test" />
       </list>
     </recent_temporary>
   </component>
@@ -302,6 +337,7 @@
       <workItem from="1637596220956" duration="77000" />
       <workItem from="1637598222577" duration="10055000" />
       <workItem from="1637737012825" duration="13585000" />
+      <workItem from="1637912307189" duration="3277000" />
     </task>
     <servers />
   </component>
@@ -335,6 +371,7 @@
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/AutoControl$json_test.coverage" NAME="json_test Coverage Results" MODIFIED="1637914634106" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/unit_test/platform_independent/test/json" />
     <SUITE FILE_PATH="coverage/AutoControl$pytest_in_timeout_test_py.coverage" NAME="pytest in timeout_test.py Coverage Results" MODIFIED="1637595746804" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/timeout" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$locate_all_image.coverage" NAME="locate_all_image Coverage Results" MODIFIED="1629265031765" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$__init__.coverage" NAME="__init__ Coverage Results" MODIFIED="1629650079668" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/utils/critical_exit" />
@@ -377,6 +414,7 @@
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$locate_and_click_test.coverage" NAME="locate_and_click_test Coverage Results" MODIFIED="1629389052166" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$pytest_in_test_json_action_py.coverage" NAME="pytest in test_json_action.py Coverage Results" MODIFIED="1634291033300" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$critical_exit_test.coverage" NAME="critical_exit_test Coverage Results" MODIFIED="1636338101156" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/critical_exit" />
+    <SUITE FILE_PATH="coverage/AutoControl$action_executor.coverage" NAME="action_executor Coverage Results" MODIFIED="1637913491910" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/utils/action_executer" />
     <SUITE FILE_PATH="coverage/AutoControl$screen_test.coverage" NAME="screen_test Coverage Results" MODIFIED="1637737335291" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/screen" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$pytest_in_test_auto_control_exception_py.coverage" NAME="pytest in test_auto_control_exception.py Coverage Results" MODIFIED="1633600091253" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$mouse_test.coverage" NAME="mouse_test Coverage Results" MODIFIED="1636335919333" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/mouse" />
diff --git a/circle_ci_test/circle_ci_test_source/test.png b/circle_ci_test/unit_test/circle_ci_test_source/test.png
similarity index 100%
rename from circle_ci_test/circle_ci_test_source/test.png
rename to circle_ci_test/unit_test/circle_ci_test_source/test.png
diff --git a/circle_ci_test/circle_ci_test_source/test1.PNG b/circle_ci_test/unit_test/circle_ci_test_source/test1.PNG
similarity index 100%
rename from circle_ci_test/circle_ci_test_source/test1.PNG
rename to circle_ci_test/unit_test/circle_ci_test_source/test1.PNG
diff --git a/circle_ci_test/circle_ci_test_source/test_template.png b/circle_ci_test/unit_test/circle_ci_test_source/test_template.png
similarity index 100%
rename from circle_ci_test/circle_ci_test_source/test_template.png
rename to circle_ci_test/unit_test/circle_ci_test_source/test_template.png
diff --git a/circle_ci_test/critical_exit/critical_exit_test.py b/circle_ci_test/unit_test/critical_exit/critical_exit_test.py
similarity index 100%
rename from circle_ci_test/critical_exit/critical_exit_test.py
rename to circle_ci_test/unit_test/critical_exit/critical_exit_test.py
diff --git a/circle_ci_test/critical_exit/real_critical_test.py b/circle_ci_test/unit_test/critical_exit/real_critical_test.py
similarity index 100%
rename from circle_ci_test/critical_exit/real_critical_test.py
rename to circle_ci_test/unit_test/critical_exit/real_critical_test.py
diff --git a/circle_ci_test/exception/test_auto_control_exception.py b/circle_ci_test/unit_test/exception/test_auto_control_exception.py
similarity index 100%
rename from circle_ci_test/exception/test_auto_control_exception.py
rename to circle_ci_test/unit_test/exception/test_auto_control_exception.py
diff --git a/circle_ci_test/exception/test_image_not_found_exception.py b/circle_ci_test/unit_test/exception/test_image_not_found_exception.py
similarity index 100%
rename from circle_ci_test/exception/test_image_not_found_exception.py
rename to circle_ci_test/unit_test/exception/test_image_not_found_exception.py
diff --git a/circle_ci_test/execute_action/execute_action_test.py b/circle_ci_test/unit_test/execute_action/execute_action_test.py
similarity index 100%
rename from circle_ci_test/execute_action/execute_action_test.py
rename to circle_ci_test/unit_test/execute_action/execute_action_test.py
diff --git a/circle_ci_test/image/locate_all_image_test.py b/circle_ci_test/unit_test/image/locate_all_image_test.py
similarity index 100%
rename from circle_ci_test/image/locate_all_image_test.py
rename to circle_ci_test/unit_test/image/locate_all_image_test.py
diff --git a/circle_ci_test/image/locate_and_click_test.py b/circle_ci_test/unit_test/image/locate_and_click_test.py
similarity index 100%
rename from circle_ci_test/image/locate_and_click_test.py
rename to circle_ci_test/unit_test/image/locate_and_click_test.py
diff --git a/circle_ci_test/image/locate_image_center_test.py b/circle_ci_test/unit_test/image/locate_image_center_test.py
similarity index 100%
rename from circle_ci_test/image/locate_image_center_test.py
rename to circle_ci_test/unit_test/image/locate_image_center_test.py
diff --git a/circle_ci_test/json/json_test.py b/circle_ci_test/unit_test/json/json_test.py
similarity index 100%
rename from circle_ci_test/json/json_test.py
rename to circle_ci_test/unit_test/json/json_test.py
diff --git a/circle_ci_test/keyboard/hotkey_test.py b/circle_ci_test/unit_test/keyboard/hotkey_test.py
similarity index 100%
rename from circle_ci_test/keyboard/hotkey_test.py
rename to circle_ci_test/unit_test/keyboard/hotkey_test.py
diff --git a/circle_ci_test/keyboard/keyboard_is_press_test.py b/circle_ci_test/unit_test/keyboard/keyboard_is_press_test.py
similarity index 100%
rename from circle_ci_test/keyboard/keyboard_is_press_test.py
rename to circle_ci_test/unit_test/keyboard/keyboard_is_press_test.py
diff --git a/circle_ci_test/keyboard/keyboard_type_test.py b/circle_ci_test/unit_test/keyboard/keyboard_type_test.py
similarity index 100%
rename from circle_ci_test/keyboard/keyboard_type_test.py
rename to circle_ci_test/unit_test/keyboard/keyboard_type_test.py
diff --git a/circle_ci_test/keyboard/keyboard_write_test.py b/circle_ci_test/unit_test/keyboard/keyboard_write_test.py
similarity index 100%
rename from circle_ci_test/keyboard/keyboard_write_test.py
rename to circle_ci_test/unit_test/keyboard/keyboard_write_test.py
diff --git a/circle_ci_test/mouse/mouse_scroll_test.py b/circle_ci_test/unit_test/mouse/mouse_scroll_test.py
similarity index 100%
rename from circle_ci_test/mouse/mouse_scroll_test.py
rename to circle_ci_test/unit_test/mouse/mouse_scroll_test.py
diff --git a/circle_ci_test/mouse/mouse_test.py b/circle_ci_test/unit_test/mouse/mouse_test.py
similarity index 100%
rename from circle_ci_test/mouse/mouse_test.py
rename to circle_ci_test/unit_test/mouse/mouse_test.py
diff --git a/circle_ci_test/record/record_test.py b/circle_ci_test/unit_test/record/record_test.py
similarity index 100%
rename from circle_ci_test/record/record_test.py
rename to circle_ci_test/unit_test/record/record_test.py
diff --git a/circle_ci_test/screen/screen_test.py b/circle_ci_test/unit_test/screen/screen_test.py
similarity index 100%
rename from circle_ci_test/screen/screen_test.py
rename to circle_ci_test/unit_test/screen/screen_test.py
diff --git a/circle_ci_test/screen/screenshot_test.py b/circle_ci_test/unit_test/screen/screenshot_test.py
similarity index 100%
rename from circle_ci_test/screen/screenshot_test.py
rename to circle_ci_test/unit_test/screen/screenshot_test.py
diff --git a/circle_ci_test/timeout/timeout_test.py b/circle_ci_test/unit_test/timeout/timeout_test.py
similarity index 100%
rename from circle_ci_test/timeout/timeout_test.py
rename to circle_ci_test/unit_test/timeout/timeout_test.py
diff --git a/test/platform_independent/exception/test_auto_control_exception.py b/test/unit_test/platform_independent/exception/test_auto_control_exception.py
similarity index 100%
rename from test/platform_independent/exception/test_auto_control_exception.py
rename to test/unit_test/platform_independent/exception/test_auto_control_exception.py
diff --git a/test/platform_independent/exception/test_image_not_found_exception.py b/test/unit_test/platform_independent/exception/test_image_not_found_exception.py
similarity index 100%
rename from test/platform_independent/exception/test_image_not_found_exception.py
rename to test/unit_test/platform_independent/exception/test_image_not_found_exception.py
diff --git a/test/platform_independent/test/critical_exit/critical_exit_test.py b/test/unit_test/platform_independent/test/critical_exit/critical_exit_test.py
similarity index 100%
rename from test/platform_independent/test/critical_exit/critical_exit_test.py
rename to test/unit_test/platform_independent/test/critical_exit/critical_exit_test.py
diff --git a/test/platform_independent/test/critical_exit/real_critical_test.py b/test/unit_test/platform_independent/test/critical_exit/real_critical_test.py
similarity index 100%
rename from test/platform_independent/test/critical_exit/real_critical_test.py
rename to test/unit_test/platform_independent/test/critical_exit/real_critical_test.py
diff --git a/test/platform_independent/test/execute_action/execute_action_test.py b/test/unit_test/platform_independent/test/execute_action/execute_action_test.py
similarity index 100%
rename from test/platform_independent/test/execute_action/execute_action_test.py
rename to test/unit_test/platform_independent/test/execute_action/execute_action_test.py
diff --git a/test/platform_independent/test/image/locate_all_image.py b/test/unit_test/platform_independent/test/image/locate_all_image.py
similarity index 100%
rename from test/platform_independent/test/image/locate_all_image.py
rename to test/unit_test/platform_independent/test/image/locate_all_image.py
diff --git a/test/platform_independent/test/image/locate_and_click.py b/test/unit_test/platform_independent/test/image/locate_and_click.py
similarity index 100%
rename from test/platform_independent/test/image/locate_and_click.py
rename to test/unit_test/platform_independent/test/image/locate_and_click.py
diff --git a/test/platform_independent/test/image/locate_image_center.py b/test/unit_test/platform_independent/test/image/locate_image_center.py
similarity index 100%
rename from test/platform_independent/test/image/locate_image_center.py
rename to test/unit_test/platform_independent/test/image/locate_image_center.py
diff --git a/test/platform_independent/test/json/json_test.py b/test/unit_test/platform_independent/test/json/json_test.py
similarity index 88%
rename from test/platform_independent/test/json/json_test.py
rename to test/unit_test/platform_independent/test/json/json_test.py
index 2ff4219..f441df5 100644
--- a/test/platform_independent/test/json/json_test.py
+++ b/test/unit_test/platform_independent/test/json/json_test.py
@@ -17,5 +17,5 @@
 list(test_loads_json)
 
 write_action_json(os.getcwd() + "/test.json", test_dumps_json)
-read_json = read_action_json(os.getcwd() + "/test.json")
+read_json = json.loads(read_action_json(os.getcwd() + "/test.json"))
 print(read_json)
diff --git a/test/platform_independent/test/keyboard/hotkey_test.py b/test/unit_test/platform_independent/test/keyboard/hotkey_test.py
similarity index 100%
rename from test/platform_independent/test/keyboard/hotkey_test.py
rename to test/unit_test/platform_independent/test/keyboard/hotkey_test.py
diff --git a/test/platform_independent/test/keyboard/keyboard_is_press_test.py b/test/unit_test/platform_independent/test/keyboard/keyboard_is_press_test.py
similarity index 100%
rename from test/platform_independent/test/keyboard/keyboard_is_press_test.py
rename to test/unit_test/platform_independent/test/keyboard/keyboard_is_press_test.py
diff --git a/test/platform_independent/test/keyboard/keyboard_type_test.py b/test/unit_test/platform_independent/test/keyboard/keyboard_type_test.py
similarity index 100%
rename from test/platform_independent/test/keyboard/keyboard_type_test.py
rename to test/unit_test/platform_independent/test/keyboard/keyboard_type_test.py
diff --git a/test/platform_independent/test/keyboard/keyboard_write_test.py b/test/unit_test/platform_independent/test/keyboard/keyboard_write_test.py
similarity index 100%
rename from test/platform_independent/test/keyboard/keyboard_write_test.py
rename to test/unit_test/platform_independent/test/keyboard/keyboard_write_test.py
diff --git a/test/platform_independent/test/mouse/mouse_scroll_test.py b/test/unit_test/platform_independent/test/mouse/mouse_scroll_test.py
similarity index 100%
rename from test/platform_independent/test/mouse/mouse_scroll_test.py
rename to test/unit_test/platform_independent/test/mouse/mouse_scroll_test.py
diff --git a/test/platform_independent/test/mouse/mouse_test.py b/test/unit_test/platform_independent/test/mouse/mouse_test.py
similarity index 100%
rename from test/platform_independent/test/mouse/mouse_test.py
rename to test/unit_test/platform_independent/test/mouse/mouse_test.py
diff --git a/test/platform_independent/test/record/record_test.py b/test/unit_test/platform_independent/test/record/record_test.py
similarity index 100%
rename from test/platform_independent/test/record/record_test.py
rename to test/unit_test/platform_independent/test/record/record_test.py
diff --git a/test/platform_independent/test/screen/screen_test.py b/test/unit_test/platform_independent/test/screen/screen_test.py
similarity index 100%
rename from test/platform_independent/test/screen/screen_test.py
rename to test/unit_test/platform_independent/test/screen/screen_test.py
diff --git a/test/platform_independent/test/screen/screenshot_test.py b/test/unit_test/platform_independent/test/screen/screenshot_test.py
similarity index 100%
rename from test/platform_independent/test/screen/screenshot_test.py
rename to test/unit_test/platform_independent/test/screen/screenshot_test.py
diff --git a/test/platform_independent/test/timeout/timeout_test.py b/test/unit_test/platform_independent/test/timeout/timeout_test.py
similarity index 100%
rename from test/platform_independent/test/timeout/timeout_test.py
rename to test/unit_test/platform_independent/test/timeout/timeout_test.py
diff --git a/test/platform_independent/with_editor/auto_gui_with_je_editor.py b/test/unit_test/platform_independent/with_editor/auto_gui_with_je_editor.py
similarity index 100%
rename from test/platform_independent/with_editor/auto_gui_with_je_editor.py
rename to test/unit_test/platform_independent/with_editor/auto_gui_with_je_editor.py
diff --git a/test/test_source/test.png b/test/unit_test/test_source/test.png
similarity index 100%
rename from test/test_source/test.png
rename to test/unit_test/test_source/test.png
diff --git a/test/test_source/test1.PNG b/test/unit_test/test_source/test1.PNG
similarity index 100%
rename from test/test_source/test1.PNG
rename to test/unit_test/test_source/test1.PNG
diff --git a/test/test_source/test_template.png b/test/unit_test/test_source/test_template.png
similarity index 100%
rename from test/test_source/test_template.png
rename to test/unit_test/test_source/test_template.png

From 73c82a60ca5abad9828a2de1d41d49c4401e7db2 Mon Sep 17 00:00:00 2001
From: JE-Chen <zenxcvwait@gmail.com>
Date: Wed, 1 Dec 2021 13:00:46 +0800
Subject: [PATCH 2/4] refactor old code & update ver

refactor old code & update ver
(exception refactor)
---
 .circleci/config.yml                          |   2 +-
 .idea/workspace.xml                           | 144 +++++++-----------
 .../utils/action_executer/action_executor.py  |  32 ----
 .../utils/critical_exit/critcal_exit.py       |   1 +
 .../wrapper/auto_control_keyboard.py          |   8 +-
 je_auto_control/wrapper/auto_control_mouse.py |  24 +--
 setup.py                                      |   2 +-
 ...tion.py => auto_control_exception_test.py} |   0
 .../image_not_found_exception_test.py         |   4 +
 .../test_image_not_found_exception.py         |   3 -
 .../execute_action/execute_action_test.py     |   3 +-
 11 files changed, 83 insertions(+), 140 deletions(-)
 rename test/unit_test/platform_independent/exception/{test_auto_control_exception.py => auto_control_exception_test.py} (100%)
 create mode 100644 test/unit_test/platform_independent/exception/image_not_found_exception_test.py
 delete mode 100644 test/unit_test/platform_independent/exception/test_image_not_found_exception.py

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ed05ed4..835a806 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,7 +44,7 @@ jobs:
           name: scroll_test
       # exception test
       - run:
-          command: python ./circle_ci_test/unit_test/exception/test_auto_control_exception.py
+          command: python ./circle_ci_test/unit_test/exception/auto_control_exception_test.py
           name: test_auto_control_exception
       # image detect
       - run:
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0a1bc2a..a642dce 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,51 +4,14 @@
     <list default="true" id="99292fb8-fc1c-4a2d-a504-0b1ea6c77fb2" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.circleci/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.circleci/config.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/circle_ci_test_source/test.png" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/circle_ci_test_source/test.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/circle_ci_test_source/test1.PNG" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/circle_ci_test_source/test1.PNG" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/circle_ci_test_source/test_template.png" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/circle_ci_test_source/test_template.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/critical_exit/critical_exit_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/critical_exit/critical_exit_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/critical_exit/real_critical_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/critical_exit/real_critical_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/exception/test_auto_control_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/exception/test_auto_control_exception.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/exception/test_image_not_found_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/exception/test_image_not_found_exception.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/execute_action/execute_action_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/execute_action/execute_action_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/image/locate_all_image_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/image/locate_all_image_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/image/locate_and_click_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/image/locate_and_click_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/image/locate_image_center_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/image/locate_image_center_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/json/json_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/json/json_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/keyboard/hotkey_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/keyboard/hotkey_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/keyboard/keyboard_is_press_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/keyboard/keyboard_is_press_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/keyboard/keyboard_type_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/keyboard/keyboard_type_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/keyboard/keyboard_write_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/keyboard/keyboard_write_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/mouse/mouse_scroll_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/mouse/mouse_scroll_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/mouse/mouse_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/mouse/mouse_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/record/record_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/record/record_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/screen/screen_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/screen/screen_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/screen/screenshot_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/screen/screenshot_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/circle_ci_test/timeout/timeout_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/circle_ci_test/unit_test/timeout/timeout_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/exception/test_auto_control_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/test_auto_control_exception.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/exception/test_image_not_found_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/test_image_not_found_exception.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/critical_exit/critical_exit_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit/critical_exit_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/critical_exit/real_critical_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit/real_critical_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/execute_action/execute_action_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action/execute_action_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/image/locate_all_image.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/image/locate_all_image.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/image/locate_and_click.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/image/locate_and_click.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/image/locate_image_center.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/image/locate_image_center.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/json/json_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/json/json_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/hotkey_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/keyboard/hotkey_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_is_press_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/keyboard/keyboard_is_press_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_type_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/keyboard/keyboard_type_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_write_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/keyboard/keyboard_write_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/mouse/mouse_scroll_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/mouse/mouse_scroll_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/mouse/mouse_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/mouse/mouse_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/record/record_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/record/record_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/screen/screen_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/screen/screen_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/screen/screenshot_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/screen/screenshot_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/test/timeout/timeout_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/timeout/timeout_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/platform_independent/with_editor/auto_gui_with_je_editor.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/with_editor/auto_gui_with_je_editor.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/test_source/test.png" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/test_source/test.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/test_source/test1.PNG" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/test_source/test1.PNG" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/test_source/test_template.png" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/test_source/test_template.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/je_auto_control/utils/action_executer/action_executor.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/utils/action_executer/action_executor.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/je_auto_control/utils/critical_exit/critcal_exit.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/utils/critical_exit/critcal_exit.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_keyboard.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_keyboard.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_mouse.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_mouse.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/test_auto_control_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/auto_control_exception_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/test_image_not_found_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/image_not_found_exception_test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action/execute_action_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action/execute_action_test.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -117,8 +80,8 @@
       <recent name="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\test\platform_independent\test\record" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.json_test">
-    <configuration name="action_executor" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="Python.execute_action_test">
+    <configuration name="execute_action_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -126,12 +89,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/je_auto_control/utils/action_executer" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/je_auto_control/utils/action_executer/action_executor.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action/execute_action_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -140,7 +103,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="hotkey_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="image_not_found_exception_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -148,12 +111,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/exception" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/keyboard/hotkey_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/exception/image_not_found_exception_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -184,20 +147,20 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="keyboard_type_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="multiprocess_timeout" type="PythonConfigurationType" factoryName="Python">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
-      <option name="IS_MODULE_SDK" value="true" />
+      <option name="SDK_HOME" value="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\venv\Scripts\python.exe" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/je_auto_control/utils/timeout" />
+      <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_type_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/je_auto_control/utils/timeout/multiprocess_timeout.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -206,7 +169,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="keyboard_write_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="real_critical_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -214,12 +177,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/test/keyboard/keyboard_write_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit/real_critical_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -228,7 +191,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="multiprocess_timeout" type="PythonConfigurationType" factoryName="Python">
+    <configuration name="test_auto_control_exception" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -236,12 +199,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\venv\Scripts\python.exe" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/je_auto_control/utils/timeout" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/exception" />
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/je_auto_control/utils/timeout/multiprocess_timeout.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/exception/test_auto_control_exception.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -250,44 +213,39 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="test_auto_control_exception" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+    <configuration name="pytest in auto_control_exception_test.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\venv\Scripts\python.exe" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/exception" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/exception" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/exception/test_auto_control_exception.py" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_parameters" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/test/unit_test/platform_independent/exception/auto_control_exception_test.py&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
     <list>
       <item itemvalue="Python.multiprocess_timeout" />
       <item itemvalue="Python.test_auto_control_exception" />
-      <item itemvalue="Python.hotkey_test" />
-      <item itemvalue="Python.keyboard_type_test" />
-      <item itemvalue="Python.keyboard_write_test" />
-      <item itemvalue="Python.action_executor" />
       <item itemvalue="Python.json_test" />
+      <item itemvalue="Python.image_not_found_exception_test" />
+      <item itemvalue="Python.real_critical_test" />
+      <item itemvalue="Python.execute_action_test" />
+      <item itemvalue="Python tests.pytest in auto_control_exception_test.py" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.execute_action_test" />
+        <item itemvalue="Python.real_critical_test" />
+        <item itemvalue="Python tests.pytest in auto_control_exception_test.py" />
+        <item itemvalue="Python.image_not_found_exception_test" />
         <item itemvalue="Python.json_test" />
-        <item itemvalue="Python.action_executor" />
-        <item itemvalue="Python.hotkey_test" />
-        <item itemvalue="Python.keyboard_write_test" />
-        <item itemvalue="Python.keyboard_type_test" />
       </list>
     </recent_temporary>
   </component>
@@ -337,7 +295,17 @@
       <workItem from="1637596220956" duration="77000" />
       <workItem from="1637598222577" duration="10055000" />
       <workItem from="1637737012825" duration="13585000" />
-      <workItem from="1637912307189" duration="3277000" />
+      <workItem from="1637912307189" duration="3872000" />
+      <workItem from="1637924700095" duration="1188000" />
+      <workItem from="1638155870782" duration="980000" />
+      <workItem from="1638182931277" duration="635000" />
+      <workItem from="1638187587373" duration="595000" />
+      <workItem from="1638248953167" duration="1855000" />
+      <workItem from="1638270826033" duration="489000" />
+      <workItem from="1638275363791" duration="3475000" />
+      <workItem from="1638285394804" duration="1487000" />
+      <workItem from="1638327363748" duration="1554000" />
+      <workItem from="1638331973979" duration="1222000" />
     </task>
     <servers />
   </component>
@@ -380,6 +348,7 @@
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$locate_all_image_test.coverage" NAME="locate_all_image_test Coverage Results" MODIFIED="1629389018535" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$execute_action_test.coverage" NAME="execute_action_test Coverage Results" MODIFIED="1634416736563" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/AutoControl$hotkey_test.coverage" NAME="hotkey_test Coverage Results" MODIFIED="1637744624754" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
+    <SUITE FILE_PATH="coverage/AutoControl$execute_action_test.coverage" NAME="execute_action_test Coverage Results" MODIFIED="1638327418906" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$real_critical_test.coverage" NAME="real_critical_test Coverage Results" MODIFIED="1634136655791" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$import_test.coverage" NAME="import_test Coverage Results" MODIFIED="1629286120014" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test" />
     <SUITE FILE_PATH="coverage/AutoControl$multiprocess_timeout.coverage" NAME="multiprocess_timeout Coverage Results" MODIFIED="1637593410735" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/utils/timeout" />
@@ -408,6 +377,7 @@
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$keyboard_write_test.coverage" NAME="keyboard_write_test Coverage Results" MODIFIED="1636891949186" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$locate_image_center_test.coverage" NAME="locate_image_center_test Coverage Results" MODIFIED="1629389045129" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$action_execute.coverage" NAME="action_execute Coverage Results" MODIFIED="1637128387624" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/utils/action_executer" />
+    <SUITE FILE_PATH="coverage/AutoControl$image_not_found_exception_test.coverage" NAME="image_not_found_exception_test Coverage Results" MODIFIED="1638157029852" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/unit_test/platform_independent/exception" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$win32_record.coverage" NAME="win32_record Coverage Results" MODIFIED="1633892287671" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/windows/record" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$record_test__1_.coverage" NAME="record_test (1) Coverage Results" MODIFIED="1634135762635" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$mouse_listener.coverage" NAME="win32_mouse_listener Coverage Results" MODIFIED="1633683416552" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/windows/listener" />
@@ -416,6 +386,8 @@
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$critical_exit_test.coverage" NAME="critical_exit_test Coverage Results" MODIFIED="1636338101156" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/critical_exit" />
     <SUITE FILE_PATH="coverage/AutoControl$action_executor.coverage" NAME="action_executor Coverage Results" MODIFIED="1637913491910" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/utils/action_executer" />
     <SUITE FILE_PATH="coverage/AutoControl$screen_test.coverage" NAME="screen_test Coverage Results" MODIFIED="1637737335291" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/screen" />
+    <SUITE FILE_PATH="coverage/AutoControl$pytest_in_test_image_not_found_exception_py.coverage" NAME="pytest in test_image_not_found_exception.py Coverage Results" MODIFIED="1638156084484" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/unit_test/platform_independent/exception" />
+    <SUITE FILE_PATH="coverage/AutoControl$pytest_in_test_auto_control_exception_py.coverage" NAME="pytest in test_auto_control_exception.py Coverage Results" MODIFIED="1638157045378" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/unit_test/platform_independent/exception" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$pytest_in_test_auto_control_exception_py.coverage" NAME="pytest in test_auto_control_exception.py Coverage Results" MODIFIED="1633600091253" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$mouse_test.coverage" NAME="mouse_test Coverage Results" MODIFIED="1636335919333" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/mouse" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$execute_action_test__1_.coverage" NAME="execute_action_test (1) Coverage Results" MODIFIED="1634415056314" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test" />
diff --git a/je_auto_control/utils/action_executer/action_executor.py b/je_auto_control/utils/action_executer/action_executor.py
index 7d92878..c55867d 100644
--- a/je_auto_control/utils/action_executer/action_executor.py
+++ b/je_auto_control/utils/action_executer/action_executor.py
@@ -78,35 +78,3 @@ def execute_action(action_list: list):
         print(temp_string)
         execute_record_string = "".join([execute_record_string, temp_string + "\n"])
     return execute_record_string
-
-
-if __name__ == "__main__":
-    import sys
-
-    test_list = None
-    if sys.platform in ["win32", "cygwin", "msys"]:
-        test_list = [
-            ["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}],
-        ]
-    elif sys.platform in ["linux", "linux2"]:
-        test_list = [
-            ["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}],
-        ]
-    elif sys.platform in ["darwin"]:
-        test_list = [
-            ["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}],
-        ]
-    print("\n\n")
-    print(execute_action(test_list))
diff --git a/je_auto_control/utils/critical_exit/critcal_exit.py b/je_auto_control/utils/critical_exit/critcal_exit.py
index 24b5b28..9594093 100644
--- a/je_auto_control/utils/critical_exit/critcal_exit.py
+++ b/je_auto_control/utils/critical_exit/critcal_exit.py
@@ -33,6 +33,7 @@ def run(self):
                 if keyboard_check.check_key_is_press(self._exit_check_key):
                     _thread.interrupt_main()
         except AutoControlException:
+            _thread.interrupt_main()
             raise AutoControlException(je_auto_control_critical_exit_error)
 
     def init_critical_exit(self):
diff --git a/je_auto_control/wrapper/auto_control_keyboard.py b/je_auto_control/wrapper/auto_control_keyboard.py
index e383c6b..b0009df 100644
--- a/je_auto_control/wrapper/auto_control_keyboard.py
+++ b/je_auto_control/wrapper/auto_control_keyboard.py
@@ -22,7 +22,7 @@ def press_key(keycode: [int, str], is_shift: bool = False, **kwargs):
     if type(keycode) is not int:
         try:
             keycode = keys_table.get(keycode)
-        except Exception:
+        except AutoControlCantFindKeyException:
             raise AutoControlCantFindKeyException(table_cant_find_key)
     try:
         if sys.platform in ["win32", "cygwin", "msys", "linux", "linux2"]:
@@ -30,7 +30,7 @@ def press_key(keycode: [int, str], is_shift: bool = False, **kwargs):
         elif sys.platform in ["darwin"]:
             keyboard.press_key(keycode, is_shift=is_shift)
         return str(keycode)
-    except Exception:
+    except AutoControlKeyboardException:
         raise AutoControlKeyboardException(keyboard_press_key)
 
 
@@ -42,7 +42,7 @@ def release_key(keycode: [int, str], is_shift: bool = False, **kwargs):
     if type(keycode) is not int:
         try:
             keycode = keys_table.get(keycode)
-        except Exception:
+        except AutoControlCantFindKeyException:
             raise AutoControlCantFindKeyException(table_cant_find_key)
     try:
         if sys.platform in ["win32", "cygwin", "msys", "linux", "linux2"]:
@@ -50,7 +50,7 @@ def release_key(keycode: [int, str], is_shift: bool = False, **kwargs):
         elif sys.platform in ["darwin"]:
             keyboard.release_key(keycode, is_shift=is_shift)
         return str(keycode)
-    except Exception:
+    except AutoControlKeyboardException:
         raise AutoControlKeyboardException(keyboard_release_key)
 
 
diff --git a/je_auto_control/wrapper/auto_control_mouse.py b/je_auto_control/wrapper/auto_control_mouse.py
index e714dd6..7e13781 100644
--- a/je_auto_control/wrapper/auto_control_mouse.py
+++ b/je_auto_control/wrapper/auto_control_mouse.py
@@ -20,7 +20,7 @@ def position():
     """
     try:
         return mouse.position()
-    except Exception:
+    except AutoControlMouseException:
         raise AutoControlMouseException(mouse_get_position)
 
 
@@ -32,7 +32,7 @@ def set_position(x: int, y: int, **kwargs):
     try:
         mouse.set_position(x=x, y=y)
         return x, y
-    except Exception:
+    except AutoControlMouseException:
         raise AutoControlMouseException(mouse_set_position)
 
 
@@ -47,7 +47,7 @@ def press_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwarg
             mouse_keycode = mouse_table.get(mouse_keycode)
         else:
             pass
-    except Exception:
+    except AutoControlCantFindKeyException:
         raise AutoControlCantFindKeyException(table_cant_find_key)
     try:
         now_x, now_y = position()
@@ -60,7 +60,7 @@ def press_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwarg
         elif sys.platform in ["darwin"]:
             mouse.press_mouse(x, y, mouse_keycode)
         return mouse_keycode, x, y
-    except Exception:
+    except AutoControlMouseException:
         raise AutoControlMouseException(mouse_press_mouse)
 
 
@@ -75,7 +75,7 @@ def release_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwa
             mouse_keycode = mouse_table.get(mouse_keycode)
         else:
             pass
-    except Exception:
+    except AutoControlCantFindKeyException:
         raise AutoControlCantFindKeyException(table_cant_find_key)
     try:
         now_x, now_y = position()
@@ -83,7 +83,7 @@ def release_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwa
             x = now_x
         if y is None:
             y = now_y
-    except Exception:
+    except AutoControlMouseException:
         raise AutoControlMouseException(mouse_get_position)
     try:
         if sys.platform in ["win32", "cygwin", "msys", "linux", "linux2"]:
@@ -91,7 +91,7 @@ def release_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwa
         elif sys.platform in ["darwin"]:
             mouse.release_mouse(x, y, mouse_keycode)
         return mouse_keycode, x, y
-    except Exception:
+    except AutoControlMouseException:
         raise AutoControlMouseException(mouse_release_mouse)
 
 
@@ -106,7 +106,7 @@ def click_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwarg
             mouse_keycode = mouse_table.get(mouse_keycode)
         else:
             pass
-    except Exception:
+    except AutoControlCantFindKeyException:
         raise AutoControlCantFindKeyException(table_cant_find_key)
     try:
         now_x, now_y = position()
@@ -114,12 +114,12 @@ def click_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwarg
             x = now_x
         if y is None:
             y = now_y
-    except Exception:
+    except AutoControlMouseException:
         raise AutoControlMouseException(mouse_get_position)
     try:
         mouse.click_mouse(mouse_keycode, x, y)
         return mouse_keycode, x, y
-    except Exception:
+    except AutoControlMouseException:
         raise AutoControlMouseException(mouse_click_mouse)
 
 
@@ -136,7 +136,7 @@ def scroll(scroll_value: int, x: int = None, y: int = None, scroll_direction: st
     """
     try:
         now_cursor_x, now_cursor_y = position()
-    except Exception:
+    except AutoControlMouseException:
         raise AutoControlMouseException(mouse_get_position)
     width, height = size()
     if x is None:
@@ -162,5 +162,5 @@ def scroll(scroll_value: int, x: int = None, y: int = None, scroll_direction: st
             scroll_direction = special_table.get(scroll_direction)
             mouse.scroll(scroll_value, scroll_direction)
         return scroll_value, scroll_direction
-    except Exception:
+    except AutoControlMouseException:
         raise AutoControlMouseException(mouse_click_mouse)
diff --git a/setup.py b/setup.py
index 9e077cf..8330c5b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="je_auto_control",
-    version="0.0.73",
+    version="0.0.74",
     author="JE-Chen",
     author_email="zenmailman@gmail.com",
     description="auto testing",
diff --git a/test/unit_test/platform_independent/exception/test_auto_control_exception.py b/test/unit_test/platform_independent/exception/auto_control_exception_test.py
similarity index 100%
rename from test/unit_test/platform_independent/exception/test_auto_control_exception.py
rename to test/unit_test/platform_independent/exception/auto_control_exception_test.py
diff --git a/test/unit_test/platform_independent/exception/image_not_found_exception_test.py b/test/unit_test/platform_independent/exception/image_not_found_exception_test.py
new file mode 100644
index 0000000..4d85477
--- /dev/null
+++ b/test/unit_test/platform_independent/exception/image_not_found_exception_test.py
@@ -0,0 +1,4 @@
+from je_auto_control.utils.je_auto_control_exception.exceptions import ImageNotFoundException
+
+print(repr(ImageNotFoundException("test.png")))
+print(repr(ImageNotFoundException("DW{PD}{DP}W{DOLD}PW{KDP{WKDP}WD][wpa][dwpa][dwaod()DW()Dikwa")))
diff --git a/test/unit_test/platform_independent/exception/test_image_not_found_exception.py b/test/unit_test/platform_independent/exception/test_image_not_found_exception.py
deleted file mode 100644
index 7b98ced..0000000
--- a/test/unit_test/platform_independent/exception/test_image_not_found_exception.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from je_auto_control.utils.je_auto_control_exception.exceptions import ImageNotFoundException
-
-raise ImageNotFoundException("test.png")
diff --git a/test/unit_test/platform_independent/test/execute_action/execute_action_test.py b/test/unit_test/platform_independent/test/execute_action/execute_action_test.py
index 5399a1e..0986805 100644
--- a/test/unit_test/platform_independent/test/execute_action/execute_action_test.py
+++ b/test/unit_test/platform_independent/test/execute_action/execute_action_test.py
@@ -11,9 +11,10 @@
         ["press_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}],
         ["release_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}],
     ]
+
 elif sys.platform in ["linux", "linux2"]:
     test_list = [
-        ["type_key", {"keycode": 38}],
+        ["type_key", {"keycode": 38}], a
         ["mouse_left", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}],
         ["position"],
         ["press_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}],

From e523524a93bfce69b3e5f0912806d077637adfd5 Mon Sep 17 00:00:00 2001
From: JE-Chen <zenxcvwait@gmail.com>
Date: Wed, 1 Dec 2021 13:09:44 +0800
Subject: [PATCH 3/4] fix test wrong path

fix test wrong path
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 835a806..ed05ed4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,7 +44,7 @@ jobs:
           name: scroll_test
       # exception test
       - run:
-          command: python ./circle_ci_test/unit_test/exception/auto_control_exception_test.py
+          command: python ./circle_ci_test/unit_test/exception/test_auto_control_exception.py
           name: test_auto_control_exception
       # image detect
       - run:

From c31562289afd609d752dee03863f02d59b9a6bf7 Mon Sep 17 00:00:00 2001
From: JE-Chen <zenxcvwait@gmail.com>
Date: Wed, 1 Dec 2021 19:03:17 +0800
Subject: [PATCH 4/4] fix executor error

fix executor error
---
 .idea/workspace.xml                           | 100 +++++++++---------
 .../utils/action_executer/action_executor.py  |   4 +-
 .../wrapper/auto_control_record.py            |  38 ++-----
 setup.py                                      |   2 +-
 4 files changed, 62 insertions(+), 82 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a642dce..fee017f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,16 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="99292fb8-fc1c-4a2d-a504-0b1ea6c77fb2" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.circleci/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.circleci/config.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/je_auto_control/utils/action_executer/action_executor.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/utils/action_executer/action_executor.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/je_auto_control/utils/critical_exit/critcal_exit.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/utils/critical_exit/critcal_exit.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_keyboard.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_keyboard.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_mouse.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_mouse.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_record.py" beforeDir="false" afterPath="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_record.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/test_auto_control_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/auto_control_exception_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/test_image_not_found_exception.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/exception/image_not_found_exception_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action/execute_action_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action/execute_action_test.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -80,8 +74,8 @@
       <recent name="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\test\platform_independent\test\record" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.execute_action_test">
-    <configuration name="execute_action_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="Python.record_test (1)">
+    <configuration name="auto_control_record" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -89,12 +83,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/je_auto_control/wrapper" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action/execute_action_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/je_auto_control/wrapper/auto_control_record.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -103,7 +97,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="image_not_found_exception_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="execute_action_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -111,12 +105,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/exception" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/exception/image_not_found_exception_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action/execute_action_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -125,20 +119,20 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="json_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="multiprocess_timeout" type="PythonConfigurationType" factoryName="Python">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/json" />
-      <option name="IS_MODULE_SDK" value="true" />
+      <option name="SDK_HOME" value="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\venv\Scripts\python.exe" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/je_auto_control/utils/timeout" />
+      <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/json/json_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/je_auto_control/utils/timeout/multiprocess_timeout.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -147,20 +141,20 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="multiprocess_timeout" type="PythonConfigurationType" factoryName="Python">
+    <configuration name="real_critical_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\venv\Scripts\python.exe" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/je_auto_control/utils/timeout" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/je_auto_control/utils/timeout/multiprocess_timeout.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit/real_critical_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -169,7 +163,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="real_critical_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="record_test (1)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -177,12 +171,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/record" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/critical_exit/real_critical_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/unit_test/platform_independent/test/record/record_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -191,20 +185,20 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="test_auto_control_exception" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+    <configuration name="record_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\venv\Scripts\python.exe" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/exception" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/circle_ci_test/unit_test/record" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/exception/test_auto_control_exception.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/circle_ci_test/unit_test/record/record_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -213,39 +207,44 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="pytest in auto_control_exception_test.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+    <configuration name="test_auto_control_exception" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="Python_JEAutoControl" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/unit_test/platform_independent/exception" />
-      <option name="IS_MODULE_SDK" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="D:\WorkSpaces\Program WorkSpace\Python\Project\Python_JEAutoControl\venv\Scripts\python.exe" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/platform_independent/exception" />
+      <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_parameters" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/test/unit_test/platform_independent/exception/auto_control_exception_test.py&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/platform_independent/exception/test_auto_control_exception.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
     <list>
       <item itemvalue="Python.multiprocess_timeout" />
       <item itemvalue="Python.test_auto_control_exception" />
-      <item itemvalue="Python.json_test" />
-      <item itemvalue="Python.image_not_found_exception_test" />
       <item itemvalue="Python.real_critical_test" />
       <item itemvalue="Python.execute_action_test" />
-      <item itemvalue="Python tests.pytest in auto_control_exception_test.py" />
+      <item itemvalue="Python.record_test" />
+      <item itemvalue="Python.auto_control_record" />
+      <item itemvalue="Python.record_test (1)" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.record_test (1)" />
+        <item itemvalue="Python.auto_control_record" />
         <item itemvalue="Python.execute_action_test" />
+        <item itemvalue="Python.record_test" />
         <item itemvalue="Python.real_critical_test" />
-        <item itemvalue="Python tests.pytest in auto_control_exception_test.py" />
-        <item itemvalue="Python.image_not_found_exception_test" />
-        <item itemvalue="Python.json_test" />
       </list>
     </recent_temporary>
   </component>
@@ -305,7 +304,7 @@
       <workItem from="1638275363791" duration="3475000" />
       <workItem from="1638285394804" duration="1487000" />
       <workItem from="1638327363748" duration="1554000" />
-      <workItem from="1638331973979" duration="1222000" />
+      <workItem from="1638331973979" duration="10572000" />
     </task>
     <servers />
   </component>
@@ -348,16 +347,19 @@
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$locate_all_image_test.coverage" NAME="locate_all_image_test Coverage Results" MODIFIED="1629389018535" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$execute_action_test.coverage" NAME="execute_action_test Coverage Results" MODIFIED="1634416736563" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/AutoControl$hotkey_test.coverage" NAME="hotkey_test Coverage Results" MODIFIED="1637744624754" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
-    <SUITE FILE_PATH="coverage/AutoControl$execute_action_test.coverage" NAME="execute_action_test Coverage Results" MODIFIED="1638327418906" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action" />
+    <SUITE FILE_PATH="coverage/AutoControl$execute_action_test.coverage" NAME="execute_action_test Coverage Results" MODIFIED="1638351207071" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/unit_test/platform_independent/test/execute_action" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$real_critical_test.coverage" NAME="real_critical_test Coverage Results" MODIFIED="1634136655791" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$import_test.coverage" NAME="import_test Coverage Results" MODIFIED="1629286120014" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test" />
     <SUITE FILE_PATH="coverage/AutoControl$multiprocess_timeout.coverage" NAME="multiprocess_timeout Coverage Results" MODIFIED="1637593410735" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/utils/timeout" />
     <SUITE FILE_PATH="coverage/AutoControl$pytest_in_multiprocess_timeout_py.coverage" NAME="pytest in multiprocess_timeout.py Coverage Results" MODIFIED="1637593405582" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/utils/timeout" />
+    <SUITE FILE_PATH="coverage/AutoControl$record_test.coverage" NAME="record_test Coverage Results" MODIFIED="1638336574327" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/circle_ci_test/unit_test/record" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$auto_gui_with_je_editor.coverage" NAME="auto_gui_with_je_editor Coverage Results" MODIFIED="1633530497756" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/with_editor" />
     <SUITE FILE_PATH="coverage/AutoControl$keyboard_write_test.coverage" NAME="keyboard_write_test Coverage Results" MODIFIED="1637739807146" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test/keyboard" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$keyboard_listener.coverage" NAME="keyboardlistener Coverage Results" MODIFIED="1633627280725" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/windows/listener" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$x11_linux_keyboard_listener.coverage" NAME="x11_linux_keyboard_listener Coverage Results" MODIFIED="1633499563779" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/linux_with_x11/keyboard" />
+    <SUITE FILE_PATH="coverage/AutoControl$record_test__1_.coverage" NAME="record_test (1) Coverage Results" MODIFIED="1638353564760" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/unit_test/platform_independent/test/record" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$record_test.coverage" NAME="record_test Coverage Results" MODIFIED="1634135481625" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/platform_independent/test" />
+    <SUITE FILE_PATH="coverage/AutoControl$auto_control_record.coverage" NAME="auto_control_record Coverage Results" MODIFIED="1638351916701" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/wrapper" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$win32_mouse_listener__1_.coverage" NAME="win32_mouse_listener (1) Coverage Results" MODIFIED="1633763741821" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/windows/listener" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$json_loader.coverage" NAME="json_loader Coverage Results" MODIFIED="1634288723749" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/utils/action_file" />
     <SUITE FILE_PATH="coverage/Python_JEAutoControl$auto_control_record.coverage" NAME="auto_control_record Coverage Results" MODIFIED="1634389632736" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/je_auto_control/wrapper" />
diff --git a/je_auto_control/utils/action_executer/action_executor.py b/je_auto_control/utils/action_executer/action_executor.py
index c55867d..6c604f7 100644
--- a/je_auto_control/utils/action_executer/action_executor.py
+++ b/je_auto_control/utils/action_executer/action_executor.py
@@ -57,8 +57,10 @@ def execute_event(action):
     event = event_dict.get(action[0])
     if len(action) == 2:
         event(**action[1])
-    else:
+    elif len(action) == 1:
         event()
+    else:
+        pass
 
 
 def execute_action(action_list: list):
diff --git a/je_auto_control/wrapper/auto_control_record.py b/je_auto_control/wrapper/auto_control_record.py
index 9925f7c..86e76d3 100644
--- a/je_auto_control/wrapper/auto_control_record.py
+++ b/je_auto_control/wrapper/auto_control_record.py
@@ -4,37 +4,8 @@
 from je_auto_control.utils.je_auto_control_exception.exception_tag import macos_record_error
 from je_auto_control.utils.je_auto_control_exception.exceptions import AutoControlException
 from je_auto_control.utils.je_auto_control_exception.exceptions import AutoControlJsonActionException
-from je_auto_control.wrapper.auto_control_keyboard import type_key
-from je_auto_control.wrapper.auto_control_mouse import click_mouse
 from je_auto_control.wrapper.platform_wrapper import recorder
 
-event_dict = {"mouse_left": "click_mouse", "mouse_right": "click_mouse", "mouse_middle": "click_mouse",
-              "keyboard": "type_key"}
-
-
-def record_mouse():
-    recorder.record_mouse()
-
-
-def stop_record_mouse():
-    action_queue = recorder.stop_record_mouse()
-    if action_queue is None:
-        raise AutoControlJsonActionException
-    for mouse_action in action_queue.queue:
-        click_mouse(mouse_action[0], mouse_action[1], mouse_action[2])
-
-
-def record_keyboard():
-    recorder.record_keyboard()
-
-
-def stop_record_keyboard():
-    action_queue = recorder.stop_record_keyboard()
-    if action_queue is None:
-        raise AutoControlJsonActionException
-    for keyboard_action in action_queue.queue:
-        type_key(keyboard_action[1])
-
 
 def record():
     if sys.platform == "darwin":
@@ -49,13 +20,18 @@ def stop_record():
     if action_queue is None:
         raise AutoControlJsonActionException
     action_list = list(action_queue.queue)
-    return execute_action(action_list)
+    new_list = list()
+    for action in action_list:
+        if action[0] == "type_key":
+            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]]))])
+    return execute_action(new_list)
 
 
 if __name__ == "__main__":
     record()
     from time import sleep
-
     sleep(5)
     stop_record()
     sleep(2)
diff --git a/setup.py b/setup.py
index 8330c5b..0b45514 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="je_auto_control",
-    version="0.0.74",
+    version="0.0.75",
     author="JE-Chen",
     author_email="zenmailman@gmail.com",
     description="auto testing",