diff options
author | fredizzimo <fsundvik@gmail.com> | 2020-03-13 20:09:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-13 14:09:38 -0400 |
commit | 9e8767917d628afd3dc43759d1d50151c61944a1 (patch) | |
tree | 0060b8968d5e9df38c37b375e4eb2d6a0d65ac0c /tests/test_common/test_fixture.cpp | |
parent | f89439ae09c06d0e85f59af2bc5e020d141f23d6 (diff) | |
download | qmk_firmware-9e8767917d628afd3dc43759d1d50151c61944a1.tar.gz qmk_firmware-9e8767917d628afd3dc43759d1d50151c61944a1.zip |
Fix pressing two keys with the same keycode but different modifiers (#2710)
* Fix extra keyboard report during test_fixture teardown
* Add tests for pressing two keys with only different modifers
* Fix #1708
When two keys that use the same keycode, but different modifiers were
pressed at the same time, the second keypress wasn't registered. This is
fixed by forcing a key release when we detect a new press for the same
keycode.
* Fix the NKRO version of is_key_pressed
* Fix uninitalized loop variable
Co-authored-by: Jack Humbert <jack.humb@gmail.com>
Diffstat (limited to 'tests/test_common/test_fixture.cpp')
-rw-r--r-- | tests/test_common/test_fixture.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index 8caf1fca4..20ed838eb 100644 --- a/tests/test_common/test_fixture.cpp +++ b/tests/test_common/test_fixture.cpp | |||
@@ -32,14 +32,15 @@ TestFixture::TestFixture() {} | |||
32 | 32 | ||
33 | TestFixture::~TestFixture() { | 33 | TestFixture::~TestFixture() { |
34 | TestDriver driver; | 34 | TestDriver driver; |
35 | layer_clear(); | ||
36 | clear_all_keys(); | ||
37 | // Run for a while to make sure all keys are completely released | 35 | // Run for a while to make sure all keys are completely released |
38 | EXPECT_CALL(driver, send_keyboard_mock(_)).Times(AnyNumber()); | 36 | EXPECT_CALL(driver, send_keyboard_mock(_)).Times(AnyNumber()); |
37 | layer_clear(); | ||
38 | clear_all_keys(); | ||
39 | idle_for(TAPPING_TERM + 10); | 39 | idle_for(TAPPING_TERM + 10); |
40 | testing::Mock::VerifyAndClearExpectations(&driver); | 40 | testing::Mock::VerifyAndClearExpectations(&driver); |
41 | // Verify that the matrix really is cleared | 41 | // Verify that the matrix really is cleared |
42 | EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(Between(0, 1)); | 42 | EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(0); |
43 | idle_for(TAPPING_TERM + 10); | ||
43 | } | 44 | } |
44 | 45 | ||
45 | void TestFixture::run_one_scan_loop() { | 46 | void TestFixture::run_one_scan_loop() { |