diff options
| author | Pascal Getreuer <50221757+getreuer@users.noreply.github.com> | 2022-06-05 00:14:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-05 09:14:02 +0200 |
| commit | 95d20e6d8bb1ffaf3024af793daf789ee0b75727 (patch) | |
| tree | 95d0bb0c179d6f42a3dafa1952caf8a4299b67ac /tests/auto_shift | |
| parent | 787165718de4ba532417fb3e04b321c950279237 (diff) | |
Fix and add unit tests for Caps Word to work with Unicode Map, Auto Shift, Retro Shift. (#17284)
* Fix Caps Word and Unicode Map
* Tests for Caps Word + Auto Shift and Unicode Map.
* Fix formatting
* Add additional keyboard report expectation macros
This commit defines five test utilities, EXPECT_REPORT, EXPECT_UNICODE,
EXPECT_EMPTY_REPORT, EXPECT_ANY_REPORT and EXPECT_NO_REPORT for use with
TestDriver.
EXPECT_REPORT sets a gmock expectation that a given keyboard report will
be sent. For instance,
EXPECT_REPORT(driver, (KC_LSFT, KC_A));
is shorthand for
EXPECT_CALL(driver,
send_keyboard_mock(KeyboardReport(KC_LSFT, KC_A)));
EXPECT_UNICODE sets a gmock expectation that a given Unicode code point
will be sent using UC_LNX input mode. For instance for U+2013,
EXPECT_UNICODE(driver, 0x2013);
expects the sequence of keys:
"Ctrl+Shift+U, 2, 0, 1, 3, space".
EXPECT_EMPTY_REPORT sets a gmock expectation that a given keyboard
report will be sent. For instance
EXPECT_EMPTY_REPORT(driver);
expects a single report without keypresses or modifiers.
EXPECT_ANY_REPORT sets a gmock expectation that a arbitrary keyboard
report will be sent, without matching its contents. For instance
EXPECT_ANY_REPORT(driver).Times(1);
expects a single arbitrary keyboard report will be sent.
EXPECT_NO_REPORT sets a gmock expectation that no keyboard report will
be sent at all.
* Add tap_key() and tap_keys() to TestFixture.
This commit adds a `tap_key(key)` method to TestFixture that taps a
given KeymapKey, optionally with a specified delay between press and
release.
Similarly, the method `tap_keys(key_a, key_b, key_c)` taps a sequence of
KeymapKeys.
* Use EXPECT_REPORT, tap_keys, etc. in most tests.
This commit uses EXPECT_REPORT, EXPECT_UNICODE, EXPECT_EMPTY_REPORT,
EXPECT_NO_REPORT, tap_key() and tap_keys() test utilities from the
previous two commits in most tests. Particularly the EXPECT_REPORT
macro is frequently useful and makes a nice reduction in boilerplate
needed to express many tests.
Co-authored-by: David Kosorin <david@kosorin.net>
Diffstat (limited to 'tests/auto_shift')
| -rw-r--r-- | tests/auto_shift/test_auto_shift.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto_shift/test_auto_shift.cpp b/tests/auto_shift/test_auto_shift.cpp index a19b5dfa82..a83f436c33 100644 --- a/tests/auto_shift/test_auto_shift.cpp +++ b/tests/auto_shift/test_auto_shift.cpp | |||
| @@ -34,14 +34,14 @@ TEST_F(AutoShift, key_release_before_timeout) { | |||
| 34 | set_keymap({regular_key}); | 34 | set_keymap({regular_key}); |
| 35 | 35 | ||
| 36 | /* Press regular key */ | 36 | /* Press regular key */ |
| 37 | EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0); | 37 | EXPECT_NO_REPORT(driver); |
| 38 | regular_key.press(); | 38 | regular_key.press(); |
| 39 | run_one_scan_loop(); | 39 | run_one_scan_loop(); |
| 40 | testing::Mock::VerifyAndClearExpectations(&driver); | 40 | testing::Mock::VerifyAndClearExpectations(&driver); |
| 41 | 41 | ||
| 42 | /* Release regular key */ | 42 | /* Release regular key */ |
| 43 | EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A))); | 43 | EXPECT_REPORT(driver, (KC_A)); |
| 44 | EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())); | 44 | EXPECT_EMPTY_REPORT(driver); |
| 45 | regular_key.release(); | 45 | regular_key.release(); |
| 46 | run_one_scan_loop(); | 46 | run_one_scan_loop(); |
| 47 | testing::Mock::VerifyAndClearExpectations(&driver); | 47 | testing::Mock::VerifyAndClearExpectations(&driver); |
| @@ -55,16 +55,16 @@ TEST_F(AutoShift, key_release_after_timeout) { | |||
| 55 | set_keymap({regular_key}); | 55 | set_keymap({regular_key}); |
| 56 | 56 | ||
| 57 | /* Press regular key */ | 57 | /* Press regular key */ |
| 58 | EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0); | 58 | EXPECT_NO_REPORT(driver); |
| 59 | regular_key.press(); | 59 | regular_key.press(); |
| 60 | idle_for(AUTO_SHIFT_TIMEOUT); | 60 | idle_for(AUTO_SHIFT_TIMEOUT); |
| 61 | testing::Mock::VerifyAndClearExpectations(&driver); | 61 | testing::Mock::VerifyAndClearExpectations(&driver); |
| 62 | 62 | ||
| 63 | /* Release regular key */ | 63 | /* Release regular key */ |
| 64 | EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_A))); | 64 | EXPECT_REPORT(driver, (KC_LSFT, KC_A)); |
| 65 | EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))); | 65 | EXPECT_REPORT(driver, (KC_LSFT)); |
| 66 | EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())); | 66 | EXPECT_EMPTY_REPORT(driver); |
| 67 | regular_key.release(); | 67 | regular_key.release(); |
| 68 | run_one_scan_loop(); | 68 | run_one_scan_loop(); |
| 69 | testing::Mock::VerifyAndClearExpectations(&driver); | 69 | testing::Mock::VerifyAndClearExpectations(&driver); |
| 70 | } \ No newline at end of file | 70 | } |
