diff options
author | Erovia <Erovia@users.noreply.github.com> | 2020-10-07 01:10:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-06 17:10:19 -0700 |
commit | 058737f116b53116726f32175205b46e22396f86 (patch) | |
tree | d84cecc2d1716d93b56b078a3f86eff14db13415 /lib/python/qmk/tests | |
parent | c9a06965c991a84ac76014d9791e439f88dfb957 (diff) | |
download | qmk_firmware-058737f116b53116726f32175205b46e22396f86.tar.gz qmk_firmware-058737f116b53116726f32175205b46e22396f86.zip |
[CLI] Add c2json (#8817)
* Basic keymap parsing finally works
* Add 'keymap.json' creation to the qmk.keymap module
* Add tests and fix formatting
* Fix/exclude flake8 errors
* Convert keymap.c to valid keymap.json
* Fix some errors
* Add tests
* Finalize keymap.json creation, add json template
* Add docs
* Move pygments to the standard requirements
* Add support for nameless layers, fix tests
* Fix things after rebase
* Add missing 'keymap' value.
* Fix missing layer numbers from advanced keycodes
Buckwich noticed that if the advanced keycode / layer toggling key
contains a number, it goes missing.
Now we properly handle them.
Thx for noticing!
* Apply suggestions from code review
* fixup tests
Co-authored-by: Zach White <skullydazed@drpepper.org>
Co-authored-by: skullY <skullydazed@gmail.com>
Diffstat (limited to 'lib/python/qmk/tests')
-rw-r--r-- | lib/python/qmk/tests/test_cli_commands.py | 22 | ||||
-rw-r--r-- | lib/python/qmk/tests/test_qmk_keymap.py | 20 |
2 files changed, 40 insertions, 2 deletions
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index 0b840b466..7ac0bcbde 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py | |||
@@ -1,10 +1,11 @@ | |||
1 | import subprocess | 1 | from subprocess import STDOUT, PIPE |
2 | |||
2 | from qmk.commands import run | 3 | from qmk.commands import run |
3 | 4 | ||
4 | 5 | ||
5 | def check_subcommand(command, *args): | 6 | def check_subcommand(command, *args): |
6 | cmd = ['bin/qmk', command] + list(args) | 7 | cmd = ['bin/qmk', command] + list(args) |
7 | result = run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) | 8 | result = run(cmd, stdout=PIPE, stderr=STDOUT, universal_newlines=True) |
8 | return result | 9 | return result |
9 | 10 | ||
10 | 11 | ||
@@ -28,6 +29,11 @@ def test_compile(): | |||
28 | check_returncode(result) | 29 | check_returncode(result) |
29 | 30 | ||
30 | 31 | ||
32 | def test_compile_json(): | ||
33 | result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default_json') | ||
34 | check_returncode(result) | ||
35 | |||
36 | |||
31 | def test_flash(): | 37 | def test_flash(): |
32 | result = check_subcommand('flash', '-kb', 'handwired/onekey/pytest', '-km', 'default', '-n') | 38 | result = check_subcommand('flash', '-kb', 'handwired/onekey/pytest', '-km', 'default', '-n') |
33 | check_returncode(result) | 39 | check_returncode(result) |
@@ -153,3 +159,15 @@ def test_info_matrix_render(): | |||
153 | assert 'LAYOUT_ortho_1x1' in result.stdout | 159 | assert 'LAYOUT_ortho_1x1' in result.stdout |
154 | assert '│0A│' in result.stdout | 160 | assert '│0A│' in result.stdout |
155 | assert 'Matrix for "LAYOUT_ortho_1x1"' in result.stdout | 161 | assert 'Matrix for "LAYOUT_ortho_1x1"' in result.stdout |
162 | |||
163 | |||
164 | def test_c2json(): | ||
165 | result = check_subcommand("c2json", "-kb", "handwired/onekey/pytest", "-km", "default", "keyboards/handwired/onekey/keymaps/default/keymap.c") | ||
166 | check_returncode(result) | ||
167 | assert result.stdout.strip() == '{"keyboard": "handwired/onekey/pytest", "documentation": "This file is a keymap.json file for handwired/onekey/pytest", "keymap": "default", "layout": "LAYOUT_ortho_1x1", "layers": [["KC_A"]]}' | ||
168 | |||
169 | |||
170 | def test_c2json_nocpp(): | ||
171 | result = check_subcommand("c2json", "--no-cpp", "-kb", "handwired/onekey/pytest", "-km", "default", "keyboards/handwired/onekey/keymaps/pytest_nocpp/keymap.c") | ||
172 | check_returncode(result) | ||
173 | assert result.stdout.strip() == '{"keyboard": "handwired/onekey/pytest", "documentation": "This file is a keymap.json file for handwired/onekey/pytest", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_ENTER"]]}' | ||
diff --git a/lib/python/qmk/tests/test_qmk_keymap.py b/lib/python/qmk/tests/test_qmk_keymap.py index d8669e549..7ef708e0d 100644 --- a/lib/python/qmk/tests/test_qmk_keymap.py +++ b/lib/python/qmk/tests/test_qmk_keymap.py | |||
@@ -6,14 +6,34 @@ def test_template_onekey_proton_c(): | |||
6 | assert templ == qmk.keymap.DEFAULT_KEYMAP_C | 6 | assert templ == qmk.keymap.DEFAULT_KEYMAP_C |
7 | 7 | ||
8 | 8 | ||
9 | def test_template_onekey_proton_c_json(): | ||
10 | templ = qmk.keymap.template('handwired/onekey/proton_c', type='json') | ||
11 | assert templ == {'keyboard': 'handwired/onekey/proton_c'} | ||
12 | |||
13 | |||
9 | def test_template_onekey_pytest(): | 14 | def test_template_onekey_pytest(): |
10 | templ = qmk.keymap.template('handwired/onekey/pytest') | 15 | templ = qmk.keymap.template('handwired/onekey/pytest') |
11 | assert templ == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};\n' | 16 | assert templ == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};\n' |
12 | 17 | ||
13 | 18 | ||
19 | def test_template_onekey_pytest_json(): | ||
20 | templ = qmk.keymap.template('handwired/onekey/pytest', type='json') | ||
21 | assert templ == {'keyboard': 'handwired/onekey/pytest', "documentation": "This file is a keymap.json file for handwired/onekey/pytest"} | ||
22 | |||
23 | |||
14 | def test_generate_onekey_pytest(): | 24 | def test_generate_onekey_pytest(): |
15 | templ = qmk.keymap.generate('handwired/onekey/pytest', 'LAYOUT', [['KC_A']]) | 25 | templ = qmk.keymap.generate('handwired/onekey/pytest', 'LAYOUT', [['KC_A']]) |
16 | assert templ == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\t[0] = LAYOUT(KC_A)};\n' | 26 | assert templ == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\t[0] = LAYOUT(KC_A)};\n' |
17 | 27 | ||
18 | 28 | ||
29 | def test_generate_onekey_pytest_json(): | ||
30 | templ = qmk.keymap.generate('handwired/onekey/pytest', 'LAYOUT', [['KC_A']], type='json', keymap='default') | ||
31 | assert templ == {"keyboard": "handwired/onekey/pytest", "documentation": "This file is a keymap.json file for handwired/onekey/pytest", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_A"]]} | ||
32 | |||
33 | |||
34 | def test_parse_keymap_c(): | ||
35 | parsed_keymap_c = qmk.keymap.parse_keymap_c('keyboards/handwired/onekey/keymaps/default/keymap.c') | ||
36 | assert parsed_keymap_c == {'layers': [{'name': '0', 'layout': 'LAYOUT_ortho_1x1', 'keycodes': ['KC_A']}]} | ||
37 | |||
38 | |||
19 | # FIXME(skullydazed): Add a test for qmk.keymap.write that mocks up an FD. | 39 | # FIXME(skullydazed): Add a test for qmk.keymap.write that mocks up an FD. |