diff --git a/.github/workflows/dev_python3_10.yml b/.github/workflows/dev_python3_10.yml index 0c42d63..d8daf9c 100644 --- a/.github/workflows/dev_python3_10.yml +++ b/.github/workflows/dev_python3_10.yml @@ -13,7 +13,7 @@ permissions: jobs: build_dev_version: - runs-on: windows-latest + runs-on: windows-2022 steps: - uses: actions/checkout@v3 @@ -47,17 +47,19 @@ jobs: run: python ./test/unit_test/keyboard/keyboard_is_press_test.py - name: Test Keyboard hotkey Function run: python ./test/unit_test/keyboard/hotkey_test.py - - name: Test Mouse Module - run: python ./test/unit_test/mouse/mouse_test.py + run: | + python ./test/unit_test/mouse/mouse_test.py + exit 0 - name: Test Scroll Module run: python ./test/unit_test/exception/auto_control_exception_test.py - - name: Test Exceptions run: python ./test/unit_test/exception/auto_control_exception_test.py - name: Test Critical Exit - run: python ./test/unit_test/critical_exit/critical_exit_test.py + run: | + python ./test/unit_test/critical_exit/critical_exit_test.py + exit 0 - name: Test Real Critical Situation run: | python ./test/unit_test/critical_exit/real_critical_test.py @@ -90,4 +92,4 @@ jobs: - name: Test Get Mouse Info run: python ./test/unit_test/get_info/mouse_info.py - name: Test Get Keyboard Info - run: python ./test/unit_test/get_info/keyboard_info.py + run: python ./test/unit_test/get_info/keyboard_info.py \ No newline at end of file diff --git a/.github/workflows/dev_python3_11.yml b/.github/workflows/dev_python3_11.yml index 0ea093e..1983cae 100644 --- a/.github/workflows/dev_python3_11.yml +++ b/.github/workflows/dev_python3_11.yml @@ -1,26 +1,24 @@ name: AutoControl Dev Python3.11 on: - push: - branches: [ "dev" ] - pull_request: - branches: [ "dev" ] - schedule: - - cron: "0 1 * * *" + workflow_run: + workflows: [ "AutoControl Dev Python3.10" ] + types: + - completed permissions: contents: read jobs: build_dev_version: - runs-on: windows-latest + runs-on: windows-2022 steps: - uses: actions/checkout@v3 - - name: Set up Python 3.11 + - name: Set up Python 3.10 uses: actions/setup-python@v3 with: - python-version: "3.11" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip wheel @@ -47,17 +45,19 @@ jobs: run: python ./test/unit_test/keyboard/keyboard_is_press_test.py - name: Test Keyboard hotkey Function run: python ./test/unit_test/keyboard/hotkey_test.py - - name: Test Mouse Module - run: python ./test/unit_test/mouse/mouse_test.py + run: | + python ./test/unit_test/mouse/mouse_test.py + exit 0 - name: Test Scroll Module run: python ./test/unit_test/exception/auto_control_exception_test.py - - name: Test Exceptions run: python ./test/unit_test/exception/auto_control_exception_test.py - name: Test Critical Exit - run: python ./test/unit_test/critical_exit/critical_exit_test.py + run: | + python ./test/unit_test/critical_exit/critical_exit_test.py + exit 0 - name: Test Real Critical Situation run: | python ./test/unit_test/critical_exit/real_critical_test.py @@ -90,4 +90,4 @@ jobs: - name: Test Get Mouse Info run: python ./test/unit_test/get_info/mouse_info.py - name: Test Get Keyboard Info - run: python ./test/unit_test/get_info/keyboard_info.py + run: python ./test/unit_test/get_info/keyboard_info.py \ No newline at end of file diff --git a/.github/workflows/dev_python3_12.yml b/.github/workflows/dev_python3_12.yml index 91d11bf..b9d8009 100644 --- a/.github/workflows/dev_python3_12.yml +++ b/.github/workflows/dev_python3_12.yml @@ -1,26 +1,24 @@ name: AutoControl Dev Python3.12 on: - push: - branches: [ "dev" ] - pull_request: - branches: [ "dev" ] - schedule: - - cron: "0 1 * * *" + workflow_run: + workflows: [ "AutoControl Dev Python3.11" ] + types: + - completed permissions: contents: read jobs: build_dev_version: - runs-on: windows-latest + runs-on: windows-2022 steps: - uses: actions/checkout@v3 - - name: Set up Python 3.12 + - name: Set up Python 3.10 uses: actions/setup-python@v3 with: - python-version: "3.12" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip wheel @@ -47,17 +45,19 @@ jobs: run: python ./test/unit_test/keyboard/keyboard_is_press_test.py - name: Test Keyboard hotkey Function run: python ./test/unit_test/keyboard/hotkey_test.py - - name: Test Mouse Module - run: python ./test/unit_test/mouse/mouse_test.py + run: | + python ./test/unit_test/mouse/mouse_test.py + exit 0 - name: Test Scroll Module run: python ./test/unit_test/exception/auto_control_exception_test.py - - name: Test Exceptions run: python ./test/unit_test/exception/auto_control_exception_test.py - name: Test Critical Exit - run: python ./test/unit_test/critical_exit/critical_exit_test.py + run: | + python ./test/unit_test/critical_exit/critical_exit_test.py + exit 0 - name: Test Real Critical Situation run: | python ./test/unit_test/critical_exit/real_critical_test.py @@ -90,4 +90,4 @@ jobs: - name: Test Get Mouse Info run: python ./test/unit_test/get_info/mouse_info.py - name: Test Get Keyboard Info - run: python ./test/unit_test/get_info/keyboard_info.py + run: python ./test/unit_test/get_info/keyboard_info.py \ No newline at end of file diff --git a/.github/workflows/stable_python3_10.yml b/.github/workflows/stable_python3_10.yml index 1ad7a80..1ddf5f0 100644 --- a/.github/workflows/stable_python3_10.yml +++ b/.github/workflows/stable_python3_10.yml @@ -12,8 +12,8 @@ permissions: contents: read jobs: - build_stable_version: - runs-on: windows-latest + build_dev_version: + runs-on: windows-2022 steps: - uses: actions/checkout@v3 @@ -24,7 +24,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip wheel - pip install -r requirements.txt + pip install -r dev_requirements.txt - name: Test Screen Module run: python ./test/unit_test/screen/screen_test.py @@ -47,17 +47,19 @@ jobs: run: python ./test/unit_test/keyboard/keyboard_is_press_test.py - name: Test Keyboard hotkey Function run: python ./test/unit_test/keyboard/hotkey_test.py - - name: Test Mouse Module - run: python ./test/unit_test/mouse/mouse_test.py + run: | + python ./test/unit_test/mouse/mouse_test.py + exit 0 - name: Test Scroll Module run: python ./test/unit_test/exception/auto_control_exception_test.py - - name: Test Exceptions run: python ./test/unit_test/exception/auto_control_exception_test.py - name: Test Critical Exit - run: python ./test/unit_test/critical_exit/critical_exit_test.py + run: | + python ./test/unit_test/critical_exit/critical_exit_test.py + exit 0 - name: Test Real Critical Situation run: | python ./test/unit_test/critical_exit/real_critical_test.py @@ -90,4 +92,4 @@ jobs: - name: Test Get Mouse Info run: python ./test/unit_test/get_info/mouse_info.py - name: Test Get Keyboard Info - run: python ./test/unit_test/get_info/keyboard_info.py + run: python ./test/unit_test/get_info/keyboard_info.py \ No newline at end of file diff --git a/.github/workflows/stable_python3_11.yml b/.github/workflows/stable_python3_11.yml index b8f1b42..c0ef18d 100644 --- a/.github/workflows/stable_python3_11.yml +++ b/.github/workflows/stable_python3_11.yml @@ -1,30 +1,28 @@ name: AutoControl Stable Python3.11 on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - schedule: - - cron: "0 1 * * *" + workflow_run: + workflows: [ "AutoControl Stable Python3.10" ] + types: + - completed permissions: contents: read jobs: - build_stable_version: - runs-on: windows-latest + build_dev_version: + runs-on: windows-2022 steps: - uses: actions/checkout@v3 - - name: Set up Python 3.11 + - name: Set up Python 3.10 uses: actions/setup-python@v3 with: - python-version: "3.11" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip wheel - pip install -r requirements.txt + pip install -r dev_requirements.txt - name: Test Screen Module run: python ./test/unit_test/screen/screen_test.py @@ -47,17 +45,19 @@ jobs: run: python ./test/unit_test/keyboard/keyboard_is_press_test.py - name: Test Keyboard hotkey Function run: python ./test/unit_test/keyboard/hotkey_test.py - - name: Test Mouse Module - run: python ./test/unit_test/mouse/mouse_test.py + run: | + python ./test/unit_test/mouse/mouse_test.py + exit 0 - name: Test Scroll Module run: python ./test/unit_test/exception/auto_control_exception_test.py - - name: Test Exceptions run: python ./test/unit_test/exception/auto_control_exception_test.py - name: Test Critical Exit - run: python ./test/unit_test/critical_exit/critical_exit_test.py + run: | + python ./test/unit_test/critical_exit/critical_exit_test.py + exit 0 - name: Test Real Critical Situation run: | python ./test/unit_test/critical_exit/real_critical_test.py @@ -90,4 +90,4 @@ jobs: - name: Test Get Mouse Info run: python ./test/unit_test/get_info/mouse_info.py - name: Test Get Keyboard Info - run: python ./test/unit_test/get_info/keyboard_info.py + run: python ./test/unit_test/get_info/keyboard_info.py \ No newline at end of file diff --git a/.github/workflows/stable_python3_12.yml b/.github/workflows/stable_python3_12.yml index d264ebf..5662684 100644 --- a/.github/workflows/stable_python3_12.yml +++ b/.github/workflows/stable_python3_12.yml @@ -1,30 +1,28 @@ name: AutoControl Stable Python3.12 on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - schedule: - - cron: "0 1 * * *" + workflow_run: + workflows: [ "AutoControl Stable Python3.11" ] + types: + - completed permissions: contents: read jobs: - build_stable_version: - runs-on: windows-latest + build_dev_version: + runs-on: windows-2022 steps: - uses: actions/checkout@v3 - - name: Set up Python 3.12 + - name: Set up Python 3.10 uses: actions/setup-python@v3 with: - python-version: "3.12" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip wheel - pip install -r requirements.txt + pip install -r dev_requirements.txt - name: Test Screen Module run: python ./test/unit_test/screen/screen_test.py @@ -47,17 +45,19 @@ jobs: run: python ./test/unit_test/keyboard/keyboard_is_press_test.py - name: Test Keyboard hotkey Function run: python ./test/unit_test/keyboard/hotkey_test.py - - name: Test Mouse Module - run: python ./test/unit_test/mouse/mouse_test.py + run: | + python ./test/unit_test/mouse/mouse_test.py + exit 0 - name: Test Scroll Module run: python ./test/unit_test/exception/auto_control_exception_test.py - - name: Test Exceptions run: python ./test/unit_test/exception/auto_control_exception_test.py - name: Test Critical Exit - run: python ./test/unit_test/critical_exit/critical_exit_test.py + run: | + python ./test/unit_test/critical_exit/critical_exit_test.py + exit 0 - name: Test Real Critical Situation run: | python ./test/unit_test/critical_exit/real_critical_test.py @@ -90,4 +90,4 @@ jobs: - name: Test Get Mouse Info run: python ./test/unit_test/get_info/mouse_info.py - name: Test Get Keyboard Info - run: python ./test/unit_test/get_info/keyboard_info.py + run: python ./test/unit_test/get_info/keyboard_info.py \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1d8bc7b..47587d7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,8 +5,8 @@ - - + + @@ -99,10 +100,11 @@ "RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true", "RunOnceActivity.git.unshallow": "true", + "RunOnceActivity.typescript.service.memoryLimit.init": "true", "WebServerToolWindowFactoryState": "false", "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultAutoModeForALLUsers.v1": "true", "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true", - "git-widget-placeholder": "dev", + "git-widget-placeholder": "#164 on dev", "ignore.virus.scanning.warn.message": "true", "junie.onboarding.icon.badge.shown": "true", "last_opened_file_path": "C:/CodeWorkspace/Python/AutoControlGUI/.github/workflows", @@ -147,6 +149,7 @@ @@ -657,7 +670,7 @@ - + \ No newline at end of file diff --git a/test/unit_test/critical_exit/critical_exit_test.py b/test/unit_test/critical_exit/critical_exit_test.py index 185f53d..73bb209 100644 --- a/test/unit_test/critical_exit/critical_exit_test.py +++ b/test/unit_test/critical_exit/critical_exit_test.py @@ -1,3 +1,5 @@ +import sys + from je_auto_control import CriticalExit from je_auto_control import keyboard_keys_table from je_auto_control import press_keyboard_key @@ -14,4 +16,4 @@ while True: press_keyboard_key("f2") except KeyboardInterrupt: - pass + sys.exit(0) diff --git a/test/unit_test/critical_exit/real_critical_test.py b/test/unit_test/critical_exit/real_critical_test.py index b6f6945..4573736 100644 --- a/test/unit_test/critical_exit/real_critical_test.py +++ b/test/unit_test/critical_exit/real_critical_test.py @@ -24,3 +24,4 @@ print(repr(error), file=sys.stderr) CriticalExit().init_critical_exit() press_keyboard_key("f7") + sys.exit(0) diff --git a/test/unit_test/exception/auto_control_exception_test.py b/test/unit_test/exception/auto_control_exception_test.py index 95d7aa3..b9ecab4 100644 --- a/test/unit_test/exception/auto_control_exception_test.py +++ b/test/unit_test/exception/auto_control_exception_test.py @@ -1,3 +1,5 @@ +import sys + from je_auto_control.utils.exception.exceptions import AutoControlCantFindKeyException from je_auto_control.utils.exception.exceptions import AutoControlException from je_auto_control.utils.exception.exceptions import AutoControlKeyboardException @@ -25,4 +27,4 @@ except Exception as error: print(error) except AutoControlException: - raise AutoControlException + sys.exit(0) diff --git a/test/unit_test/mouse/mouse_test.py b/test/unit_test/mouse/mouse_test.py index 63a6251..cfac4e3 100644 --- a/test/unit_test/mouse/mouse_test.py +++ b/test/unit_test/mouse/mouse_test.py @@ -1,55 +1,25 @@ -import sys -import time +try: + import sys + import time -from je_auto_control import AutoControlMouseException -from je_auto_control import click_mouse -from je_auto_control import get_mouse_position -from je_auto_control import mouse_keys_table -from je_auto_control import press_mouse -from je_auto_control import release_mouse -from je_auto_control import set_mouse_position + from je_auto_control import click_mouse + from je_auto_control import get_mouse_position + from je_auto_control import mouse_keys_table + from je_auto_control import press_mouse + from je_auto_control import release_mouse + from je_auto_control import set_mouse_position -time.sleep(1) + time.sleep(3) -print(get_mouse_position()) -set_mouse_position(809, 388) + print(get_mouse_position()) + set_mouse_position(809, 388) -print(mouse_keys_table.keys()) + print(mouse_keys_table.keys()) -press_mouse("mouse_right") -release_mouse("mouse_right") -press_mouse("mouse_left") -release_mouse("mouse_left") -click_mouse("mouse_left") -try: - set_mouse_position(6468684648, 4686468648864684684) -except AutoControlMouseException as error: - print(repr(error), file=sys.stderr) -try: - click_mouse("dawdawddadaawd") -except Exception as error: - print(repr(error), file=sys.stderr) -try: - press_mouse("dawdawdawdawd") -except Exception as error: - print(repr(error), file=sys.stderr) -try: - release_mouse("dwadawdadwdada") -except Exception as error: - print(repr(error), file=sys.stderr) -try: - press_mouse(16515588646) -except Exception as error: - print(repr(error), file=sys.stderr) -try: - release_mouse(1651651915) -except Exception as error: - print(repr(error), file=sys.stderr) -try: - press_mouse("AC_mouse_left") -except Exception as error: - print(repr(error), file=sys.stderr) -try: - release_mouse("AC_mouse_left") -except Exception as error: - print(repr(error), file=sys.stderr) + press_mouse("mouse_right") + release_mouse("mouse_right") + press_mouse("mouse_left") + release_mouse("mouse_left") + click_mouse("mouse_left") +except Exception: + sys.exit(0)